diff --git a/packages/web/src/appobj/AppObjectListItem.svelte b/packages/web/src/appobj/AppObjectListItem.svelte
index 0bafecdb4..db3044219 100644
--- a/packages/web/src/appobj/AppObjectListItem.svelte
+++ b/packages/web/src/appobj/AppObjectListItem.svelte
@@ -70,7 +70,7 @@
         {filter}
         {passProps}
         {isExpandedBySearch}
-        isExpandedOnlyBySearch={isExpandedBySearch && !isExpanded}
+        {isExpanded}
       />
     </div>
   {/if}
diff --git a/packages/web/src/appobj/SubDatabaseList.svelte b/packages/web/src/appobj/SubDatabaseList.svelte
index 27a2d6aa8..c50809fef 100644
--- a/packages/web/src/appobj/SubDatabaseList.svelte
+++ b/packages/web/src/appobj/SubDatabaseList.svelte
@@ -11,8 +11,10 @@
   export let data;
   export let passProps;
 
-  export let isExpandedOnlyBySearch;
   export let isExpandedBySearch;
+  export let isExpanded;
+
+  $: isExpandedOnlyBySearch = isExpandedBySearch && !isExpanded;
 
   $: databases = useDatabaseList({ conid: isExpandedOnlyBySearch ? null : data._id });
   $: dbList = isExpandedOnlyBySearch ? getLocalStorage(`database_list_${data._id}`) || [] : $databases || [];
@@ -24,6 +26,6 @@
   list={_.sortBy(dbList, x => x.sortOrder ?? x.name).map(db => ({ ...db, connection: data }))}
   module={databaseAppObject}
   {passProps}
-  {filter}
+  filter={isExpanded ? '' : filter}
   {isExpandedBySearch}
 />