frontend/src/components/dialogs/NewKeyDialog.vue

@@ -174,10 +174,10 @@ const onAdd = async () => {
                 tabStore.setSelectedKeys(server, nodeKey)
                 browserStore.reloadKey({ server, db, key })
             }
-            dialogStore.closeNewKeyDialog()
         } else if (!isEmpty(msg)) {
             $message.error(msg)
         }
+        dialogStore.closeNewKeyDialog()
     } catch (e) {
         return false
     }

frontend/src/stores/tab.js

@@ -198,7 +198,6 @@ const useTabStore = defineStore('tab', {
                 })
                 this.tabList.push(tabItem)
                 tabIndex = this.tabList.length - 1
-                this._setActivatedIndex(tabIndex, true, subTab)
             } else {
                 const tab = this.tabList[tabIndex]
                 tab.blank = false
@@ -220,6 +219,7 @@ const useTabStore = defineStore('tab', {
                     tab.value = undefined
                 }
             }
+            this._setActivatedIndex(tabIndex, true, subTab)
         },
 
         /**