diff --git a/src/components/layout/EditorToolbar.vue b/src/components/layout/EditorToolbar.vue
index 78f82b8d67..45b3ba4962 100644
--- a/src/components/layout/EditorToolbar.vue
+++ b/src/components/layout/EditorToolbar.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed } from "vue";
+import { computed, watchEffect } from "vue";
 import { useI18n } from "vue-i18n";
 import {
   Play,
@@ -75,6 +75,13 @@ const activeSchemaOptions = computed(() => {
   return getSchemaOptionsForDb(connection.id, schemaDatabaseKey.value);
 });
 
+watchEffect(() => {
+  const connection = props.activeConnection;
+  if (connection && showSchemaSelector.value && schemaDatabaseKey.value) {
+    loadSchemaOptions(connection.id, schemaDatabaseKey.value).catch(() => {});
+  }
+});
+
 const isActiveDatabaseDefault = computed(() => isDefaultDatabase(props.activeConnection, activeDatabaseValue.value));
 const toolbarStyle = computed(() => {
   const color = props.activeConnection?.color;