diff --git a/src/components/config/TagBar.vue b/src/components/config/TagBar.vue
index 87629b4..b59cd74 100644
--- a/src/components/config/TagBar.vue
+++ b/src/components/config/TagBar.vue
@@ -87,9 +87,11 @@ export default {
       const savedTagOrder = dbManager.getDB(TAG_ORDER_KEY);
       if (savedTagOrder.length) {
         this.savedTagOrder = savedTagOrder;
-        this.commandManager.changeCurrentTag(this.savedTagOrder[0]);
-      } else {
-        this.commandManager.changeCurrentTag(this.allQuickCommandTags[0]);
+      }
+      if (!this.commandManager.state.currentTag) {
+        this.commandManager.changeCurrentTag(
+          this.savedTagOrder[0] || this.allQuickCommandTags[0]
+        );
       }
     });
   },