diff --git a/packages/web/src/appobj/AppObjectList.svelte b/packages/web/src/appobj/AppObjectList.svelte
index 18558721c..91e7ae559 100644
--- a/packages/web/src/appobj/AppObjectList.svelte
+++ b/packages/web/src/appobj/AppObjectList.svelte
@@ -26,7 +26,7 @@
   export let groupFunc = undefined;
   export let onDropOnGroup = undefined;
   export let emptyGroupNames = [];
-  export let isExpandedOnlyBySearch = false;
+  export let isExpandedBySearch = false;
 
   export let collapsedGroupNames = writable([]);
   export let onChangeFilteredList = undefined;
@@ -79,8 +79,8 @@
   $: groups = groupFunc ? extendGroups(_.groupBy(listGrouped, 'group'), emptyGroupNames) : null;
 
   $: listLimited =
-    isExpandedOnlyBySearch && !expandLimited ? filtered.slice(0, Math.min(filter.trim().length, 3)) : list;
-  $: isListLimited = isExpandedOnlyBySearch && listLimited.length < filtered.length;
+    isExpandedBySearch && !expandLimited ? filtered.slice(0, Math.min(filter.trim().length, 3)) : list;
+  $: isListLimited = isExpandedBySearch && listLimited.length < filtered.length;
 </script>
 
 {#if groupFunc}
diff --git a/packages/web/src/appobj/AppObjectListItem.svelte b/packages/web/src/appobj/AppObjectListItem.svelte
index 687a29570..0bafecdb4 100644
--- a/packages/web/src/appobj/AppObjectListItem.svelte
+++ b/packages/web/src/appobj/AppObjectListItem.svelte
@@ -63,10 +63,13 @@
   {#if (isExpanded || isExpandedBySearch) && subItemsComponent}
     <div class="subitems">
       <svelte:component
-        this={subItemsComponent(data, { isExpandedOnlyBySearch: isExpandedBySearch && !isExpanded })}
+        this={subItemsComponent(data, {
+          isExpandedBySearch,
+        })}
         {data}
         {filter}
         {passProps}
+        {isExpandedBySearch}
         isExpandedOnlyBySearch={isExpandedBySearch && !isExpanded}
       />
     </div>
diff --git a/packages/web/src/appobj/SubDatabaseList.svelte b/packages/web/src/appobj/SubDatabaseList.svelte
index 808fb7932..27a2d6aa8 100644
--- a/packages/web/src/appobj/SubDatabaseList.svelte
+++ b/packages/web/src/appobj/SubDatabaseList.svelte
@@ -12,6 +12,7 @@
   export let passProps;
 
   export let isExpandedOnlyBySearch;
+  export let isExpandedBySearch;
 
   $: databases = useDatabaseList({ conid: isExpandedOnlyBySearch ? null : data._id });
   $: dbList = isExpandedOnlyBySearch ? getLocalStorage(`database_list_${data._id}`) || [] : $databases || [];
@@ -24,5 +25,5 @@
   module={databaseAppObject}
   {passProps}
   {filter}
-  {isExpandedOnlyBySearch}
+  {isExpandedBySearch}
 />
diff --git a/packages/web/src/appobj/SubProcedureLineList.svelte b/packages/web/src/appobj/SubProcedureLineList.svelte
index 4ba0afa53..2539c1929 100644
--- a/packages/web/src/appobj/SubProcedureLineList.svelte
+++ b/packages/web/src/appobj/SubProcedureLineList.svelte
@@ -8,7 +8,7 @@
 
   export let data;
   export let filter;
-  export let isExpandedOnlyBySearch;
+  export let isExpandedBySearch;
 </script>
 
 <AppObjectList
@@ -17,5 +17,5 @@
   }))}
   module={procedureLineAppObject}
   {filter}
-  {isExpandedOnlyBySearch}
+  {isExpandedBySearch}
 />
diff --git a/packages/web/src/appobj/SubTableColumnList.svelte b/packages/web/src/appobj/SubTableColumnList.svelte
index f9af8743e..32d06ef0b 100644
--- a/packages/web/src/appobj/SubTableColumnList.svelte
+++ b/packages/web/src/appobj/SubTableColumnList.svelte
@@ -6,7 +6,7 @@
 
   export let data;
   export let filter;
-  export let isExpandedOnlyBySearch;
+  export let isExpandedBySearch;
 </script>
 
 <AppObjectList
@@ -17,5 +17,5 @@
   }))}
   module={columnAppObject}
   {filter}
-  {isExpandedOnlyBySearch}
+  {isExpandedBySearch}
 />
diff --git a/packages/web/src/widgets/SqlObjectList.svelte b/packages/web/src/widgets/SqlObjectList.svelte
index a549db596..17c6783a9 100644
--- a/packages/web/src/widgets/SqlObjectList.svelte
+++ b/packages/web/src/widgets/SqlObjectList.svelte
@@ -269,9 +269,9 @@
             .map(x => ({ ...x, conid, database }))}
           module={databaseObjectAppObject}
           groupFunc={data => getObjectTypeFieldLabel(data.objectTypeField, driver)}
-          subItemsComponent={(data, { isExpandedOnlyBySearch }) =>
+          subItemsComponent={(data, { isExpandedBySearch }) =>
             data.objectTypeField == 'procedures' || data.objectTypeField == 'functions'
-              ? filter && isExpandedOnlyBySearch
+              ? isExpandedBySearch
                 ? SubProcedureLineList
                 : SubProcedureParamList
               : SubTableColumnList}