diff --git a/app/gui/StreamSegue.qml b/app/gui/StreamSegue.qml
index e5c51c0a..f6ce90ec 100644
--- a/app/gui/StreamSegue.qml
+++ b/app/gui/StreamSegue.qml
@@ -52,6 +52,9 @@ Item {
 
     onVisibleChanged: {
         if (visible) {
+            // Hide the toolbar before we start loading
+            toolBar.visible = false
+
             // Hook up our signals
             session.stageStarting.connect(stageStarting)
             session.stageFailed.connect(stageFailed)
@@ -68,6 +71,10 @@ Item {
             // Exit this view
             stackView.pop()
         }
+        else {
+            // Show the toolbar again when we become hidden
+            toolBar.visible = true
+        }
     }
 
     Row {
diff --git a/app/gui/main.qml b/app/gui/main.qml
index dc0b353e..f6260347 100644
--- a/app/gui/main.qml
+++ b/app/gui/main.qml
@@ -36,6 +36,7 @@ ApplicationWindow {
     }
 
     header: ToolBar {
+        id: toolBar
 
         RowLayout {
             spacing: 20