diff --git a/src/dialogs/quick-bar/ha-quick-bar.ts b/src/dialogs/quick-bar/ha-quick-bar.ts
index bb4fa61afe..ce8ace0a88 100644
--- a/src/dialogs/quick-bar/ha-quick-bar.ts
+++ b/src/dialogs/quick-bar/ha-quick-bar.ts
@@ -245,6 +245,7 @@ export class QuickBar extends LitElement {
 
     if (oldCommandMode !== this._commandMode) {
       this._items = undefined;
+      this._focusSet = false;
     }
   }