diff --git a/src/renderer/components/TheSettingBar.vue b/src/renderer/components/TheSettingBar.vue
index 605fed31..eea12cd9 100644
--- a/src/renderer/components/TheSettingBar.vue
+++ b/src/renderer/components/TheSettingBar.vue
@@ -103,11 +103,11 @@ const settingsStore = useSettingsStore();
 
 const { updateStatus } = storeToRefs(applicationStore);
 const { getSelected: selectedWorkspace } = storeToRefs(workspacesStore);
-const { getConnectionsOrder: connectionsOrder } = storeToRefs(connectionsStore);
+const { connectionsOrder } = storeToRefs(connectionsStore);
 const { disableScratchpad } = storeToRefs(settingsStore);
 
 const { showSettingModal, showScratchpad } = applicationStore;
-const { updateConnectionsOrder } = connectionsStore;
+const { updateConnectionsOrder, initConnectionsOrder } = connectionsStore;
 const { selectWorkspace } = workspacesStore;
 
 const emit = defineEmits(['show-connections-modal']);
@@ -150,6 +150,9 @@ watch(selectedWorkspace, (newVal, oldVal) => {
       }, 150);
    }
 });
+
+if (!connectionsArr.value.length)
+   initConnectionsOrder();
 </script>
 
 <style lang="scss">
diff --git a/src/renderer/stores/connections.ts b/src/renderer/stores/connections.ts
index b323660a..e6867701 100644
--- a/src/renderer/stores/connections.ts
+++ b/src/renderer/stores/connections.ts
@@ -56,23 +56,6 @@ export const useConnectionsStore = defineStore('connections', {
 
          return connectionName;
       },
-      getConnectionsOrder: state => {
-         if (state.connectionsOrder.length)
-            return state.connectionsOrder;
-         else {
-            const connectionsOrder = state.connections.map<SidebarElement>(conn => {
-               return {
-                  isFolder: false,
-                  uid: conn.uid,
-                  client: conn.client,
-                  icon: null,
-                  name: null
-               };
-            });
-            persistentStore.set('connectionsOrder', connectionsOrder);
-            return connectionsOrder;
-         }
-      },
       getConnectionOrderByUid: state => (uid:string) => state.connectionsOrder
          .find(connection => connection.uid === uid),
       getFolders: state => state.connectionsOrder.filter(conn => conn.isFolder),
@@ -88,12 +71,14 @@ export const useConnectionsStore = defineStore('connections', {
             isFolder: false,
             uid: connection.uid,
             client: connection.client,
-            icon: null
+            icon: null,
+            name: null
          });
          persistentStore.set('connectionsOrder', this.connectionsOrder);
       },
       addFolder (params: {after: string; connections: [string, string]}) {
          const index = this.connectionsOrder.findIndex((conn: SidebarElement) => conn.uid === params.after);
+
          this.connectionsOrder.splice(index, 0, {
             isFolder: true,
             uid: uidGen('F'),
@@ -137,6 +122,18 @@ export const useConnectionsStore = defineStore('connections', {
          this.connections = connections;
          persistentStore.set('connections', this.connections);
       },
+      initConnectionsOrder () {
+         this.connectionsOrder = (this.connections as ConnectionParams[]).map<SidebarElement>(conn => {
+            return {
+               isFolder: false,
+               uid: conn.uid,
+               client: conn.client,
+               icon: null,
+               name: null
+            };
+         });
+         persistentStore.set('connectionsOrder', this.connectionsOrder);
+      },
       updateConnectionsOrder (connections: SidebarElement[]) {
          const invalidElements = connections.reduce<{index: number; uid: string}[]>((acc, curr, i) => {
             if (typeof curr === 'string')