diff --git a/src/renderer/components/WorkspaceExploreBar.vue b/src/renderer/components/WorkspaceExploreBar.vue
index 3a6ebb4f..6b66d1e6 100644
--- a/src/renderer/components/WorkspaceExploreBar.vue
+++ b/src/renderer/components/WorkspaceExploreBar.vue
@@ -49,7 +49,7 @@
                :key="db.name"
                :database="db"
                :connection="connection"
-               @show-database-context="openDatabaseContext"
+               @show-schema-context="openSchemaContext"
                @show-table-context="openTableContext"
                @show-misc-context="openMiscContext"
             />
@@ -299,8 +299,8 @@ export default {
          else
             this.addNotification({ status: 'error', message: response });
       },
-      openDatabaseContext (payload) {
-         this.selectedDatabase = payload.database;
+      openSchemaContext (payload) {
+         this.selectedDatabase = payload.schema;
          this.databaseContextEvent = payload.event;
          this.isDatabaseContext = true;
       },
diff --git a/src/renderer/components/WorkspaceExploreBarSchema.vue b/src/renderer/components/WorkspaceExploreBarSchema.vue
index ea84d6ca..a6ee1508 100644
--- a/src/renderer/components/WorkspaceExploreBarSchema.vue
+++ b/src/renderer/components/WorkspaceExploreBarSchema.vue
@@ -4,7 +4,7 @@
          class="accordion-header database-name"
          :class="{'text-bold': breadcrumbs.schema === database.name}"
          @click="selectSchema(database.name)"
-         @contextmenu.prevent="showDatabaseContext($event, database.name)"
+         @contextmenu.prevent="showSchemaContext($event, database.name)"
       >
          <div v-if="isLoading" class="icon loading" />
          <i v-else class="icon mdi mdi-18px mdi-chevron-right" />
@@ -222,9 +222,9 @@ export default {
 
          this.changeBreadcrumbs({ schema, table: null });
       },
-      showDatabaseContext (event, database) {
-         this.changeBreadcrumbs({ schema: database, table: null });
-         this.$emit('show-database-context', { event, database });
+      showSchemaContext (event, schema) {
+         this.selectSchema(schema);
+         this.$emit('show-schema-context', { event, schema });
       },
       showTableContext (event, table) {
          this.setBreadcrumbs({ schema: this.database.name, [table.type]: table.name });