diff --git a/src/blackgui/components/logincomponent.cpp b/src/blackgui/components/logincomponent.cpp
index 9f5801cc2..dd2ecb8c0 100644
--- a/src/blackgui/components/logincomponent.cpp
+++ b/src/blackgui/components/logincomponent.cpp
@@ -164,6 +164,7 @@ namespace BlackGui
 
         void CLoginComponent::mainInfoAreaChanged(const QWidget *currentWidget)
         {
+            if (!sGui || sGui->isShuttingDown()) { return; }
             m_logoffCountdownTimer.stop(); // in any case stop the timer
             if (currentWidget != this && currentWidget != this->parentWidget())
             {
diff --git a/src/swiftguistandard/swiftguistd.cpp b/src/swiftguistandard/swiftguistd.cpp
index 1639a469b..1d8efd903 100644
--- a/src/swiftguistandard/swiftguistd.cpp
+++ b/src/swiftguistandard/swiftguistd.cpp
@@ -380,7 +380,7 @@ void SwiftGuiStd::onStyleSheetsChanged()
 
 void SwiftGuiStd::onCurrentMainWidgetChanged(int currentIndex)
 {
-    emit currentMainInfoAreaChanged(ui->sw_MainMiddle->currentWidget());
+    emit this->currentMainInfoAreaChanged(ui->sw_MainMiddle->currentWidget());
     Q_UNUSED(currentIndex);
 }