diff --git a/src/mainview/MainView.qml b/src/mainview/MainView.qml
index f661093945c3d5f96ac150e707dd7ccedacb41c6..d81655ec72003481cbefb2ad3d1c0e7034f9988f 100644
--- a/src/mainview/MainView.qml
+++ b/src/mainview/MainView.qml
@@ -366,10 +366,26 @@ Window {
 
             onNeedToShowMainViewWindow: {
                 mainViewStackLayout.currentIndex = 0
+                // TODO: to be simplified in the refactor
+                if (!inSettingsView) {
+                    if (currentAccountIsCalling()) {
+                        setCallStackView()
+                    } else {
+                        showWelcomeView()
+                    }
+                }
             }
 
             onWizardViewIsClosed: {
                 mainViewStackLayout.currentIndex = 0
+                // TODO: to be simplified in the refactor
+                if (!inSettingsView) {
+                    if (currentAccountIsCalling()) {
+                        setCallStackView()
+                    } else {
+                        showWelcomeView()
+                    }
+                }
             }
         }
     }