diff --git a/src/dialogs/quick-bar/ha-quick-bar.ts b/src/dialogs/quick-bar/ha-quick-bar.ts
index 2f204be372..42d5181425 100644
--- a/src/dialogs/quick-bar/ha-quick-bar.ts
+++ b/src/dialogs/quick-bar/ha-quick-bar.ts
@@ -68,7 +68,7 @@ export class QuickBar extends LitElement {
   private _focusSet = false;
 
   public async showDialog(params: QuickBarParams) {
-    this._commandMode = params.commandMode || false;
+    this._commandMode = params.commandMode || this._toggleIfAlreadyOpened();
     this._commandItems = this._generateCommandItems();
     this._entityItems = this._generateEntityItems();
     this._opened = true;
@@ -305,6 +305,10 @@ export class QuickBar extends LitElement {
       .sort((a, b) => compare(a.text.toLowerCase(), b.text.toLowerCase()));
   }
 
+  private _toggleIfAlreadyOpened() {
+    return this._opened ? !this._commandMode : false;
+  }
+
   private _setFilteredItems() {
     const items = this._commandMode ? this._commandItems : this._entityItems;
     this._items = this._filter