diff --git a/packages/web/src/widgets/SqlObjectList.svelte b/packages/web/src/widgets/SqlObjectList.svelte
index a71d4cbc4..8f38a7efe 100644
--- a/packages/web/src/widgets/SqlObjectList.svelte
+++ b/packages/web/src/widgets/SqlObjectList.svelte
@@ -60,6 +60,7 @@
   let domContainer = null;
   let domFilter = null;
   let domListHandler;
+  let expandedObjects = [];
 
   $: objects = useDatabaseInfo({ conid, database });
   $: status = useDatabaseStatus({ conid, database });
@@ -225,6 +226,11 @@
         onFocusFilterBox={text => {
           domFilter?.focus(text);
         }}
+        handleExpansion={(data, value) => {
+          expandedObjects = value
+            ? [...expandedObjects, `${data.objectTypeField}||${data.schemaName}||${data.pureName}`]
+            : expandedObjects.filter(x => x != `${data.objectTypeField}||${data.schemaName}||${data.pureName}`);
+        }}
       >
         <AppObjectList
           list={objectList
@@ -242,6 +248,13 @@
             connection: $connection,
             hideSchemaName: !!$appliedCurrentSchema,
           }}
+          getIsExpanded={data =>
+            expandedObjects.includes(`${data.objectTypeField}||${data.schemaName}||${data.pureName}`)}
+          setIsExpanded={(data, value) => {
+            expandedObjects = value
+              ? [...expandedObjects, `${data.objectTypeField}||${data.schemaName}||${data.pureName}`]
+              : expandedObjects.filter(x => x != `${data.objectTypeField}||${data.schemaName}||${data.pureName}`);
+          }}
         />
       </AppObjectListHandler>
     {/if}