diff --git a/src/blackgui/components/settingssimulatorbasicscomponent.cpp b/src/blackgui/components/settingssimulatorbasicscomponent.cpp
index b5a0f9410..30d6ccba0 100644
--- a/src/blackgui/components/settingssimulatorbasicscomponent.cpp
+++ b/src/blackgui/components/settingssimulatorbasicscomponent.cpp
@@ -160,7 +160,7 @@ namespace BlackGui
             }
             else
             {
-                this->showOverlayHTMLMessageOrMessages(msgs);
+                this->showOverlayMessagesOrHTMLMessage(msgs);
             }
 
         }
diff --git a/src/blackgui/overlaymessages.cpp b/src/blackgui/overlaymessages.cpp
index 45ee90060..e5245114a 100644
--- a/src/blackgui/overlaymessages.cpp
+++ b/src/blackgui/overlaymessages.cpp
@@ -185,6 +185,34 @@ namespace BlackGui
         this->display(timeOutMs);
     }
 
+    void COverlayMessages::showOverlayMessagesOrSingleMessage(const CStatusMessageList &messages, bool appendOldMessages, int timeOutMs)
+    {
+        if (messages.isEmpty()) { return; }
+        if (!sGui || sGui->isShuttingDown()) { return; }
+        if (messages.size() > 1)
+        {
+            this->showOverlayMessages(messages, appendOldMessages, timeOutMs);
+        }
+        else
+        {
+            this->showOverlayMessage(messages.front(), timeOutMs);
+        }
+    }
+
+    void COverlayMessages::showOverlayMessagesOrHTMLMessage(const CStatusMessageList &messages, bool appendOldMessages, int timeOutMs)
+    {
+        if (messages.isEmpty()) { return; }
+        if (!sGui || sGui->isShuttingDown()) { return; }
+        if (messages.size() > 1)
+        {
+            this->showOverlayMessages(messages, appendOldMessages, timeOutMs);
+        }
+        else
+        {
+            this->showHTMLMessage(messages.front(), timeOutMs);
+        }
+    }
+
     void COverlayMessages::sortOverlayMessages(const CPropertyIndex &propertyIndex, Qt::SortOrder order)
     {
         ui->tvp_StatusMessages->sortByPropertyIndex(propertyIndex, order);
diff --git a/src/blackgui/overlaymessages.h b/src/blackgui/overlaymessages.h
index a41c46918..9da52df15 100644
--- a/src/blackgui/overlaymessages.h
+++ b/src/blackgui/overlaymessages.h
@@ -104,6 +104,12 @@ namespace BlackGui
         //! Show multiple messages
         void showOverlayMessages(const BlackMisc::CStatusMessageList &messages, bool appendOldMessages = false, int timeOutMs = -1);
 
+        //! Show multiple messages or a single message
+        void showOverlayMessagesOrSingleMessage(const BlackMisc::CStatusMessageList &messages, bool appendOldMessages = false, int timeOutMs = -1);
+
+        //! Show multiple messages or a single message (HTML)
+        void showOverlayMessagesOrHTMLMessage(const BlackMisc::CStatusMessageList &messages, bool appendOldMessages = false, int timeOutMs = -1);
+
         //! Sort of overlay messages
         void sortOverlayMessages(const BlackMisc::CPropertyIndex &propertyIndex, Qt::SortOrder order = Qt::AscendingOrder);
 
diff --git a/src/blackgui/overlaymessagesframe.h b/src/blackgui/overlaymessagesframe.h
index 5e88d2a3e..54f0b9b52 100644
--- a/src/blackgui/overlaymessagesframe.h
+++ b/src/blackgui/overlaymessagesframe.h
@@ -156,18 +156,23 @@ namespace BlackGui
             WIDGET::repaint();
         }
 
-        //! \copydoc BlackGui::COverlayMessages::showOverlayMessages
-        void showOverlayHTMLMessageOrMessages(const BlackMisc::CStatusMessageList &messages, bool appendOldMessages = false, int timeOutMs = -1)
+        //! \copydoc BlackGui::COverlayMessages::showOverlayMessagesOrSingleMessage
+        void showOverlayMessagesOrSingleMessage(const BlackMisc::CStatusMessageList &messages, bool appendOldMessages = false, int timeOutMs = -1)
         {
             if (messages.isEmpty()) { return; }
-            if (messages.size() == 1)
-            {
-                this->showOverlayHTMLMessage(messages.front(), timeOutMs);
-            }
-            else
-            {
-                this->showOverlayMessages(messages, appendOldMessages, timeOutMs);
-            }
+            this->initInnerFrame();
+            m_overlayMessages->showOverlayMessagesOrSingleMessage(messages, appendOldMessages, timeOutMs);
+            WIDGET::repaint();
+        }
+
+
+        //! \copydoc BlackGui::COverlayMessages::showOverlayMessagesOrHTMLMessage
+        void showOverlayMessagesOrHTMLMessage(const BlackMisc::CStatusMessageList &messages, bool appendOldMessages = false, int timeOutMs = -1)
+        {
+            if (messages.isEmpty()) { return; }
+            this->initInnerFrame();
+            m_overlayMessages->showOverlayMessagesOrHTMLMessage(messages, appendOldMessages, timeOutMs);
+            WIDGET::repaint();
         }
 
         //! \copydoc BlackGui::COverlayMessages::sortOverlayMessages