diff --git a/packages/web/src/appobj/AppObjectCore.svelte b/packages/web/src/appobj/AppObjectCore.svelte
index 0ec1cc49c..70a9a8568 100644
--- a/packages/web/src/appobj/AppObjectCore.svelte
+++ b/packages/web/src/appobj/AppObjectCore.svelte
@@ -86,6 +86,7 @@
   draggable={true}
   on:click={handleClick}
   on:mouseup={handleMouseUp}
+  on:mousedown
   on:dblclick
   use:contextMenu={disableContextMenu ? null : menu}
   on:dragstart={e => {
diff --git a/packages/web/src/appobj/ConnectionAppObject.svelte b/packages/web/src/appobj/ConnectionAppObject.svelte
index 15d815289..b81a9d09a 100644
--- a/packages/web/src/appobj/ConnectionAppObject.svelte
+++ b/packages/web/src/appobj/ConnectionAppObject.svelte
@@ -178,11 +178,11 @@
   };
 
   const handleClick = async e => {
-    focusedConnectionOrDatabase.set({
-      conid: data?._id,
-      connection: data,
-      database: data.singleDatabase ? data.defaultDatabase : null,
-    });
+    // focusedConnectionOrDatabase.set({
+    //   conid: data?._id,
+    //   connection: data,
+    //   database: data.singleDatabase ? data.defaultDatabase : null,
+    // });
 
     const config = getCurrentConfig();
 
@@ -206,6 +206,14 @@
     }
   };
 
+  const handleMouseDown = () => {
+    focusedConnectionOrDatabase.set({
+      conid: data?._id,
+      connection: data,
+      database: data.singleDatabase ? data.defaultDatabase : null,
+    });
+  };
+
   const handleSqlRestore = () => {
     showModal(ImportDatabaseDumpModal, {
       connection: data,
@@ -382,6 +390,7 @@
   colorMark={passProps?.connectionColorFactory && passProps?.connectionColorFactory({ conid: data._id })}
   menu={getContextMenu}
   on:click={handleClick}
+  on:mousedown={handleMouseDown}
   on:dblclick
   on:expand
   on:dblclick={handleDoubleClick}
@@ -395,4 +404,4 @@
       ? $focusedConnectionOrDatabase?.database == data.defaultDatabase
       : !$focusedConnectionOrDatabase?.database)}
   disableBoldScroll={!!$focusedConnectionOrDatabase}
-  />
+/>
diff --git a/packages/web/src/appobj/DatabaseAppObject.svelte b/packages/web/src/appobj/DatabaseAppObject.svelte
index a6a0141a2..1f17f9e4e 100644
--- a/packages/web/src/appobj/DatabaseAppObject.svelte
+++ b/packages/web/src/appobj/DatabaseAppObject.svelte
@@ -525,11 +525,13 @@ await dbgateApi.dropAllDbObjects(${JSON.stringify(
   }}
   on:click={() => {
     // switchCurrentDatabase(data);
-    $focusedConnectionOrDatabase = { conid: data.connection?._id, database: data.name, connection: data.connection };
     if (getDatabaseClickActionSetting() == 'switch') {
       switchCurrentDatabase(data);
     }
   }}
+  on:mousedown={() => {
+    $focusedConnectionOrDatabase = { conid: data.connection?._id, database: data.name, connection: data.connection };
+  }}
   on:dragstart
   on:dragenter
   on:dragend
diff --git a/packages/web/src/appobj/DatabaseObjectAppObject.svelte b/packages/web/src/appobj/DatabaseObjectAppObject.svelte
index 620b5c6db..5fc4e413f 100644
--- a/packages/web/src/appobj/DatabaseObjectAppObject.svelte
+++ b/packages/web/src/appobj/DatabaseObjectAppObject.svelte
@@ -923,7 +923,6 @@
   export let passProps;
 
   function handleClick({ forceNewTab = false, tabPreviewMode = false, focusTab = false } = {}) {
-    $selectedDatabaseObjectAppObject = _.pick(data, ['conid', 'database', 'objectTypeField', 'pureName', 'schemaName']);
     handleDatabaseObjectClick(data, { forceNewTab, tabPreviewMode, focusTab });
   }
 
@@ -966,4 +965,7 @@
   on:dragenter
   on:dragend
   on:drop
+  on:mousedown={() => {
+    $selectedDatabaseObjectAppObject = _.pick(data, ['conid', 'database', 'objectTypeField', 'pureName', 'schemaName']);
+  }}
 />