diff --git a/packages/web/src/modals/DropDownMenu.svelte b/packages/web/src/modals/DropDownMenu.svelte
index 6af2f2e90..f5ac0c323 100644
--- a/packages/web/src/modals/DropDownMenu.svelte
+++ b/packages/web/src/modals/DropDownMenu.svelte
@@ -82,7 +82,7 @@
       submenuOffset = hoverOffset;
       return;
     }
-    if (item.switchStore) {
+    if (item.switchStore && item.switchValue) {
       item.switchStore.update(x => ({
         ...x,
         [item.switchValue]: !x[item.switchValue],
@@ -142,12 +142,12 @@
       >
         <a on:click={e => handleClick(e, item)} class:disabled={item.disabled} class:bold={item.isBold}>
           <span>
-            {#if item.switchStoreGetter}
+            {#if item.switchValue && item.switchStoreGetter}
               {#key switchIndex}
                 {#if item.switchStoreGetter()[item.switchValue]}
-                  <FontIcon icon="icon checkbox-marked" padRight />
+                  <FontIcon icon="icon check" padRight />
                 {:else}
-                  <FontIcon icon="icon checkbox-blank" padRight />
+                  <FontIcon icon="icon invisible-box" padRight />
                 {/if}
               {/key}
             {/if}
diff --git a/packages/web/src/widgets/ConnectionList.svelte b/packages/web/src/widgets/ConnectionList.svelte
index 62ca5887d..0fe182156 100644
--- a/packages/web/src/widgets/ConnectionList.svelte
+++ b/packages/web/src/widgets/ConnectionList.svelte
@@ -188,6 +188,7 @@
 
   function createSearchMenu() {
     const res = [];
+    res.push({ label: 'Search by:', isBold: true, disabled: true });
     res.push({ label: 'Display name', switchValue: 'displayName' });
     res.push({ label: 'Server', switchValue: 'server' });
     res.push({ label: 'User', switchValue: 'user' });
diff --git a/packages/web/src/widgets/SqlObjectList.svelte b/packages/web/src/widgets/SqlObjectList.svelte
index 92e2b1622..1791c727c 100644
--- a/packages/web/src/widgets/SqlObjectList.svelte
+++ b/packages/web/src/widgets/SqlObjectList.svelte
@@ -129,6 +129,7 @@
 
   function createSearchMenu() {
     const res = [];
+    res.push({ label: 'Search by:', isBold: true, disabled: true });
     if (driver?.databaseEngineTypes?.includes('document')) {
       res.push({ label: 'Collection names', switchValue: 'collectionName' });
     }