diff --git a/kde/gui/ChatPane.qml b/kde/gui/ChatPane.qml
index 29ee831..584c678 100644
--- a/kde/gui/ChatPane.qml
+++ b/kde/gui/ChatPane.qml
@@ -7,6 +7,7 @@ Item {
     property bool sidebarVisible: true
     property int maxVisibleBlocks: 80
     property var pendingBypass: null  // {sessionId, id, cmd, cwd}
+    property bool hasPendingBypass: false
     signal toggleSidebar()
     // Do not opt the chat pane into focus navigation.
     activeFocusOnTab: false
@@ -146,7 +147,7 @@ Item {
                     color: "#fff3e0"  // amber light
                     border.color: "#ff9800"
                     border.width: 1
-                    visible: chatPane.pendingBypass !== null
+                    visible: chatPane.hasPendingBypass
                     z: 100
 
                     ColumnLayout {
@@ -189,6 +190,7 @@ Item {
                                     if (chatPane.pendingBypass) {
                                         ollie.resolveBypass(chatPane.pendingBypass.sessionId, chatPane.pendingBypass.id, true)
                                         chatPane.pendingBypass = null
+                                        chatPane.hasPendingBypass = false
                                     }
                                 }
                             }
@@ -199,6 +201,7 @@ Item {
                                     if (chatPane.pendingBypass) {
                                         ollie.resolveBypass(chatPane.pendingBypass.sessionId, chatPane.pendingBypass.id, false)
                                         chatPane.pendingBypass = null
+                                        chatPane.hasPendingBypass = false
                                     }
                                 }
                             }
@@ -594,6 +597,7 @@ Connections {
                 cmd: cmd,
                 cwd: cwd
             }
+            chatPane.hasPendingBypass = true
         }
     }
 }