diff --git a/packages/web/src/appobj/ConnectionAppObject.svelte b/packages/web/src/appobj/ConnectionAppObject.svelte
index 43abce2ad..6a18b6b12 100644
--- a/packages/web/src/appobj/ConnectionAppObject.svelte
+++ b/packages/web/src/appobj/ConnectionAppObject.svelte
@@ -27,9 +27,11 @@
         conid: connection._id,
         keepOpen: true,
       });
-      if (!config.runAsPortal) {
-        expandedConnections.update(x => _.uniq([...x, connection._id]));
-      }
+      expandedConnections.update(x => _.uniq([...x, connection._id]));
+
+      // if (!config.runAsPortal && getCurrentSettings()['defaultAction.connectionClick'] != 'connect') {
+      //   expandedConnections.update(x => _.uniq([...x, connection._id]));
+      // }
     }
     // closeMultipleTabs(x => x.tabComponent == 'ConnectionTab' && x.props?.conid == connection._id, true);
   }
@@ -82,6 +84,7 @@
     extensions,
     getCurrentConfig,
     getCurrentDatabase,
+    getCurrentSettings,
     getOpenedConnections,
     getOpenedTabs,
     openedConnections,
@@ -101,6 +104,7 @@
   import ImportDatabaseDumpModal from '../modals/ImportDatabaseDumpModal.svelte';
   import { closeMultipleTabs } from '../widgets/TabsPanel.svelte';
   import AboutModal from '../modals/AboutModal.svelte';
+import { tick } from 'svelte';
 
   export let data;
   export let passProps;
@@ -128,9 +132,10 @@
     });
   };
 
-  const handleClick = () => {
+  const handleClick = async () => {
     const config = getCurrentConfig();
     if (config.runAsPortal) {
+      await tick();
       handleConnect();
       return;
     }
@@ -142,7 +147,12 @@
       return;
     }
 
-    handleOpenConnectionTab();
+    if (getCurrentSettings()['defaultAction.connectionClick'] == 'connect') {
+      await tick();
+      handleConnect();
+    } else {
+      handleOpenConnectionTab();
+    }
   };
 
   const handleSqlRestore = () => {
diff --git a/packages/web/src/settings/SettingsModal.svelte b/packages/web/src/settings/SettingsModal.svelte
index 06cffb7fd..5d30c7dad 100644
--- a/packages/web/src/settings/SettingsModal.svelte
+++ b/packages/web/src/settings/SettingsModal.svelte
@@ -102,6 +102,18 @@ ORDER BY
             defaultValue="30"
             disabled={values['connection.autoRefresh'] === false}
           />
+
+          <div class="heading">Default actions</div>
+          <FormSelectField
+            label="Connection click"
+            name="defaultAction.connectionClick"
+            isNative
+            defaultValue='openDetails'
+            options={[
+              { value: 'openDetails', label: 'Edit / open details' },
+              { value: 'connect', label: 'Connect' },
+            ]}
+          />
         </svelte:fragment>
         <svelte:fragment slot="2">
           <div class="heading">Application theme</div>