diff --git a/packages/web/src/widgets/DatabaseWidgetDetailContent.svelte b/packages/web/src/widgets/DatabaseWidgetDetailContent.svelte
index 7fe3871a1..24b6bca46 100644
--- a/packages/web/src/widgets/DatabaseWidgetDetailContent.svelte
+++ b/packages/web/src/widgets/DatabaseWidgetDetailContent.svelte
@@ -46,7 +46,7 @@
   title={driver?.databaseEngineTypes?.includes('document')
     ? _t('widget.collectionsContainers', { defaultMessage: 'Collections/containers' })
     : _t('widget.tablesViewsFunctions', { defaultMessage: 'Tables, views, functions' })}
-  name="dbObjects"
+  name="dbObjectsSql"
   storageName="dbObjectsWidget"
   skip={!(
     conid &&
@@ -60,7 +60,7 @@
 
 <WidgetColumnBarItem
   title={_t('widget.keys', { defaultMessage: 'Keys' })}
-  name="dbObjects"
+  name="dbObjectsKeyValue"
   storageName="dbObjectsWidget"
   skip={!(conid && (database || singleDatabase) && driver?.databaseEngineTypes?.includes('keyvalue'))}
   positiveCondition={correctCloudStatus}
@@ -70,7 +70,7 @@
 
 <WidgetColumnBarItem
   title={_t('widget.databaseContent', { defaultMessage: 'Database content' })}
-  name="dbObjects"
+  name="dbObjectsFocused"
   storageName="dbObjectsWidget"
   skip={conid && (database || singleDatabase)}
   positiveCondition={correctCloudStatus}
@@ -84,7 +84,7 @@
 
 <WidgetColumnBarItem
   title={_t('widget.databaseContent', { defaultMessage: 'Database content' })}
-  name="dbObjects"
+  name="dbObjectsError"
   storageName="dbObjectsWidget"
   skip={!(conid && (database || singleDatabase) && !driver)}
   positiveCondition={correctCloudStatus}
diff --git a/packages/web/src/widgets/WidgetColumnBar.svelte b/packages/web/src/widgets/WidgetColumnBar.svelte
index c5da25125..9b405ae5c 100644
--- a/packages/web/src/widgets/WidgetColumnBar.svelte
+++ b/packages/web/src/widgets/WidgetColumnBar.svelte
@@ -4,9 +4,11 @@
   import _ from 'lodash';
 
   export let hidden = false;
+  export let storageName = null;
 
-  let definitions = [];
+  let definitions = {};
   let clientHeight;
+  let definitionCount = 0;
 
   // const widgetColumnBarHeight = writable(0);
   const widgetColumnBarComputed = writable({});
@@ -19,11 +21,13 @@
       [name]: {
         ...item,
         name,
-        index: definitions.length,
+        index: definitionCount,
       },
     };
+    definitionCount += 1;
   });
   setContext('updateWidgetItemDefinition', (name, item) => {
+    // console.log('WidgetColumnBar updateWidgetItemDefinition', name, item);
     definitions = {
       ...definitions,
       [name]: { ...definitions[name], ...item },
@@ -43,8 +47,8 @@
   $: recompute(definitions);
 
   function recompute(defs: any) {
-    const visibleItems = _.values(defs)
-      .filter(x => !x.collapsed && !x.skip)
+    const visibleItems = _.orderBy(_.values(defs), ['index'])
+      .filter(x => !x.collapsed && !x.skip && x.positiveCondition)
       .map(x => x.name);
     const visibleItemsCount = visibleItems.length;
 
@@ -88,6 +92,8 @@
       visibleIndex++;
     }
 
+    // console.log('WidgetColumnBar definitions', defs);
+    // console.log('WidgetColumnBar recompute', computed);
     $widgetColumnBarComputed = computed;
   }