diff --git a/packages/web/src/appobj/AppObjectCore.svelte b/packages/web/src/appobj/AppObjectCore.svelte
index de91a73e2..0ec1cc49c 100644
--- a/packages/web/src/appobj/AppObjectCore.svelte
+++ b/packages/web/src/appobj/AppObjectCore.svelte
@@ -30,6 +30,7 @@
   export let onUnpin = null;
   export let showPinnedInsteadOfUnpin = false;
   export let indentLevel = 0;
+  export let disableBoldScroll = false;
 
   $: isChecked =
     checkedObjectsStore && $checkedObjectsStore.find(x => module?.extractKey(data) == module?.extractKey(x));
@@ -69,7 +70,7 @@
   // $: console.log(title, indentLevel);
   let domDiv;
 
-  $: if (isBold && domDiv) {
+  $: if (isBold && domDiv && !disableBoldScroll) {
     domDiv.scrollIntoView({ block: 'nearest', inline: 'nearest' });
   }
 
diff --git a/packages/web/src/appobj/AppObjectList.svelte b/packages/web/src/appobj/AppObjectList.svelte
index 29113585a..87662a659 100644
--- a/packages/web/src/appobj/AppObjectList.svelte
+++ b/packages/web/src/appobj/AppObjectList.svelte
@@ -1,6 +1,5 @@
 <script>
-  import _, { sortBy } from 'lodash';
-  import { asyncFilter } from '../utility/common';
+  import _ from 'lodash';
   import AppObjectGroup from './AppObjectGroup.svelte';
   import { plusExpandIcon } from '../icons/expandIcons';
 
diff --git a/packages/web/src/appobj/ConnectionAppObject.svelte b/packages/web/src/appobj/ConnectionAppObject.svelte
index ada422a2b..15d815289 100644
--- a/packages/web/src/appobj/ConnectionAppObject.svelte
+++ b/packages/web/src/appobj/ConnectionAppObject.svelte
@@ -394,4 +394,5 @@
     (data.singleDatabase
       ? $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 113bab9bf..a6a0141a2 100644
--- a/packages/web/src/appobj/DatabaseAppObject.svelte
+++ b/packages/web/src/appobj/DatabaseAppObject.svelte
@@ -559,4 +559,5 @@ await dbgateApi.dropAllDbObjects(${JSON.stringify(
     : null}
   isChoosed={data.connection?._id == $focusedConnectionOrDatabase?.conid &&
     data.name == $focusedConnectionOrDatabase?.database}
+  disableBoldScroll={!!$focusedConnectionOrDatabase}
 />
diff --git a/packages/web/src/widgets/ConnectionList.svelte b/packages/web/src/widgets/ConnectionList.svelte
index 2f28c4de3..1a6de188c 100644
--- a/packages/web/src/widgets/ConnectionList.svelte
+++ b/packages/web/src/widgets/ConnectionList.svelte
@@ -285,7 +285,11 @@
       expandOnClick
       isExpandable={data => $openedConnections.includes(data._id) && !data.singleDatabase}
       {filter}
-      passProps={{ ...passProps, connectionColorFactory: $connectionColorFactory, showPinnedInsteadOfUnpin: true }}
+      passProps={{
+        ...passProps,
+        connectionColorFactory: $connectionColorFactory,
+        showPinnedInsteadOfUnpin: true,
+      }}
       getIsExpanded={data => $expandedConnections.includes(data._id) && !data.singleDatabase}
       setIsExpanded={(data, value) => {
         expandedConnections.update(old => (value ? [...old, data._id] : old.filter(x => x != data._id)));
@@ -309,7 +313,10 @@
       expandOnClick
       isExpandable={data => $openedConnections.includes(data._id) && !data.singleDatabase}
       {filter}
-      passProps={{ connectionColorFactory: $connectionColorFactory, showPinnedInsteadOfUnpin: true }}
+      passProps={{
+        connectionColorFactory: $connectionColorFactory,
+        showPinnedInsteadOfUnpin: true,
+      }}
       getIsExpanded={data => $expandedConnections.includes(data._id) && !data.singleDatabase}
       setIsExpanded={(data, value) => {
         expandedConnections.update(old => (value ? [...old, data._id] : old.filter(x => x != data._id)));