diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml
index 7d84ce1af..41ea109c6 100644
--- a/resources/desktop/com.github.rssguard.appdata.xml
+++ b/resources/desktop/com.github.rssguard.appdata.xml
@@ -30,7 +30,7 @@
   <url type="donation">https://martinrotter.github.io/donate/</url>
   <content_rating type="oars-1.1" />
   <releases>
-    <release version="3.9.2" date="2021-05-28"/>
+    <release version="3.9.2" date="2021-05-31"/>
   </releases>
   <content_rating type="oars-1.0">
     <content_attribute id="violence-cartoon">none</content_attribute>
diff --git a/src/librssguard/gui/dialogs/formmain.cpp b/src/librssguard/gui/dialogs/formmain.cpp
index 29814a4fc..aba121722 100755
--- a/src/librssguard/gui/dialogs/formmain.cpp
+++ b/src/librssguard/gui/dialogs/formmain.cpp
@@ -463,7 +463,15 @@ void FormMain::updateFeedButtonsAvailability() {
 void FormMain::switchVisibility(bool force_hide) {
   if (force_hide || isVisible()) {
     if (SystemTrayIcon::isSystemTrayDesired() && SystemTrayIcon::isSystemTrayAreaAvailable()) {
-      hide();
+
+      if (QApplication::activeModalWidget() != nullptr) {
+        qApp->showGuiMessage(QSL(APP_LONG_NAME),
+                             tr("Close opened modal dialogs first."),
+                             QSystemTrayIcon::Warning, qApp->mainFormWidget(), true);
+      }
+      else {
+        hide();
+      }
     }
     else {
       // Window gets minimized in single-window mode.
diff --git a/src/librssguard/gui/systemtrayicon.cpp b/src/librssguard/gui/systemtrayicon.cpp
index 840affac3..4338ae8af 100644
--- a/src/librssguard/gui/systemtrayicon.cpp
+++ b/src/librssguard/gui/systemtrayicon.cpp
@@ -15,7 +15,7 @@
 TrayIconMenu::TrayIconMenu(const QString& title, QWidget* parent) : QMenu(title, parent) {}
 
 bool TrayIconMenu::event(QEvent* event) {
-  if (event->type() == QEvent::Show && Application::activeModalWidget() != nullptr) {
+  if (event->type() == QEvent::Type::Show && Application::activeModalWidget() != nullptr) {
     QTimer::singleShot(0, this, &TrayIconMenu::hide);
     qApp->showGuiMessage(QSL(APP_LONG_NAME),
                          tr("Close opened modal dialogs first."),