diff --git a/app/gui/QuitSegue.qml b/app/gui/QuitSegue.qml
index 5375e675..1958ff95 100644
--- a/app/gui/QuitSegue.qml
+++ b/app/gui/QuitSegue.qml
@@ -29,9 +29,6 @@ Item {
             stackView.replace(segue)
         }
         else {
-            // Show the toolbar again
-            toolBar.visible = true
-
             // Exit this view
             stackView.pop()
         }
@@ -46,6 +43,9 @@ Item {
     }
 
     StackView.onDeactivating: {
+        // Show the toolbar again
+        toolBar.visible = true
+
         // Disconnect the signal
         ComputerManager.quitAppCompleted.disconnect(quitAppCompleted)
     }