diff --git a/src/blackgui/components/mappingcomponent.cpp b/src/blackgui/components/mappingcomponent.cpp
index 49e7e1c3b..763ca5ff8 100644
--- a/src/blackgui/components/mappingcomponent.cpp
+++ b/src/blackgui/components/mappingcomponent.cpp
@@ -315,9 +315,13 @@ namespace BlackGui
 
         void CMappingComponent::doMatchingsAgain()
         {
-            if (!sGui || !sGui->getIContextSimulator() || !sGui->getISimulator() || !sGui->getISimulator()->isConnected()) { return; }
+            if (!sGui || sGui->isShuttingDown() || !sGui->getIContextSimulator()) { return; }
+            if (!sGui->getIContextSimulator()->isSimulatorAvailable()) { return; }
             const int rematchedNumber = sGui->getIContextSimulator()->doMatchingsAgain();
-            CLogMessage(this).info(u"Triggered re-matching of %1 aircraft") << rematchedNumber;
+
+            const QString info = QStringLiteral("Triggered re-matching of %1 aircraft").arg(rematchedNumber);
+            this->showOverlayHTMLMessage(info, 5000);
+            CLogMessage(this).info(info);
         }
 
         void CMappingComponent::onSaveAircraft()