diff --git a/ui/app/mainui/AppMain.qml b/ui/app/mainui/AppMain.qml
index 7d9a174b53..525c978e61 100644
--- a/ui/app/mainui/AppMain.qml
+++ b/ui/app/mainui/AppMain.qml
@@ -640,10 +640,13 @@ Item {
             Connections {
                 target: rootStore.mainModuleInst
                 onMailserverNotWorking: {
-                    Global.openPopup(mailserverNotWorkingPopupComponent);
+                    if (!appLayout.mailserverNotWorkingPopup) {
+                        appLayout.mailserverNotWorkingPopup = Global.openPopup(mailserverNotWorkingPopupComponent);
+                    }
                 }
             }
-        }
+        } // ColumnLayout
+        property var mailserverNotWorkingPopup: null
 
         Component {
             id: mailserverNotWorkingPopupComponent
@@ -652,6 +655,7 @@ Item {
                 anchors.centerIn: parent
                 header.title: qsTr("Can not connect to mailserver")
                 onClosed: {
+                    appLayout.mailserverNotWorkingPopup = null
                     destroy()
                 }