diff --git a/packages/web/src/widgets/SchemaSelector.svelte b/packages/web/src/widgets/SchemaSelector.svelte
index 54ead77f5..ffdc1a3ef 100644
--- a/packages/web/src/widgets/SchemaSelector.svelte
+++ b/packages/web/src/widgets/SchemaSelector.svelte
@@ -11,6 +11,8 @@
   export let objectList;
 
   export let onApplySelectedSchema;
+  export let valueStorageKey;
+
   let appliedSchema;
 
   $: {
@@ -46,6 +48,8 @@
   function handleAddNewSchema() {
     // runCommand('add-schema', { conid: dbinfo.conid, database: dbinfo.database });
   }
+
+  $: selectedSchema = localStorage.getItem(valueStorageKey ?? '');
 </script>
 
 {#if schemaList.length > 0}
@@ -62,6 +66,7 @@
       value={selectedSchema ?? appliedSchema ?? ''}
       on:change={e => {
         selectedSchema = e.detail;
+        localStorage.setItem(valueStorageKey, e.detail);
       }}
       selectClass="schema-select"
     />
diff --git a/packages/web/src/widgets/SqlObjectList.svelte b/packages/web/src/widgets/SqlObjectList.svelte
index a9bc75e5d..ce6c34754 100644
--- a/packages/web/src/widgets/SqlObjectList.svelte
+++ b/packages/web/src/widgets/SqlObjectList.svelte
@@ -150,6 +150,7 @@
     onApplySelectedSchema={x => {
       appliedSelectedSchema = x;
     }}
+    valueStorageKey={`sql-object-list-schema-${conid}-${database}`}
   />
 
   <WidgetsInnerContainer>