diff --git a/packages/web/src/appobj/AppObjectList.svelte b/packages/web/src/appobj/AppObjectList.svelte
index 1e0060c6b..8fb6f190e 100644
--- a/packages/web/src/appobj/AppObjectList.svelte
+++ b/packages/web/src/appobj/AppObjectList.svelte
@@ -65,6 +65,7 @@
       {checkedObjectsStore}
       {groupFunc}
       {disableContextMenu}
+      {filter}
     />
   {/each}
 {:else}
@@ -79,6 +80,7 @@
       {expandIconFunc}
       {checkedObjectsStore}
       {disableContextMenu}
+      {filter}
     />
   {/each}
 {/if}
diff --git a/packages/web/src/appobj/AppObjectListItem.svelte b/packages/web/src/appobj/AppObjectListItem.svelte
index ecf1548b3..4594551f4 100644
--- a/packages/web/src/appobj/AppObjectListItem.svelte
+++ b/packages/web/src/appobj/AppObjectListItem.svelte
@@ -10,6 +10,7 @@
   import { tick } from 'svelte';
   import { plusExpandIcon } from '../icons/expandIcons';
 
+  export let filter;
   export let module;
   export let data;
   export let subItemsComponent;
@@ -50,7 +51,7 @@
 
 {#if isExpanded && subItemsComponent}
   <div class="subitems">
-    <svelte:component this={subItemsComponent} {data} />
+    <svelte:component this={subItemsComponent} {data} {filter} />
   </div>
 {/if}
 
diff --git a/packages/web/src/appobj/SubDatabaseList.svelte b/packages/web/src/appobj/SubDatabaseList.svelte
index 8b557f67d..eb97e629c 100644
--- a/packages/web/src/appobj/SubDatabaseList.svelte
+++ b/packages/web/src/appobj/SubDatabaseList.svelte
@@ -1,11 +1,16 @@
 <script lang="ts">
+  import { filterName } from 'dbgate-tools';
   import { useDatabaseList } from '../utility/metadataLoaders';
   import AppObjectList from './AppObjectList.svelte';
   import * as databaseAppObject from './DatabaseAppObject.svelte';
 
+  export let filter;
   export let data;
 
   $: databases = useDatabaseList({ conid: data._id });
 </script>
 
-<AppObjectList list={($databases || []).map(db => ({ ...db, connection: data }))} module={databaseAppObject} />
+<AppObjectList
+  list={($databases || []).filter(x => filterName(filter, x.name)).map(db => ({ ...db, connection: data }))}
+  module={databaseAppObject}
+/>