diff --git a/packages/web/src/commands/CommandListener.svelte b/packages/web/src/commands/CommandListener.svelte
index 2e92772f1..39ef89e49 100644
--- a/packages/web/src/commands/CommandListener.svelte
+++ b/packages/web/src/commands/CommandListener.svelte
@@ -1,5 +1,5 @@
 <script lang="ts" context="module">
-  import { commands } from '../stores';
+  import { commands, visibleCommandPalette } from '../stores';
   import { get } from 'svelte/store';
   import { runGroupCommand } from './runCommand';
 
@@ -38,6 +38,7 @@
     if (notGroup.length == 1) {
       const command = notGroup[0];
       if (command.onClick) command.onClick();
+      else if (command.getSubCommands) visibleCommandPalette.set(command);
       return;
     }
 
diff --git a/packages/web/src/commands/CommandPalette.svelte b/packages/web/src/commands/CommandPalette.svelte
index d14c4a8c8..ad9cd2393 100644
--- a/packages/web/src/commands/CommandPalette.svelte
+++ b/packages/web/src/commands/CommandPalette.svelte
@@ -25,11 +25,11 @@
   import registerCommand from './registerCommand';
 
   let domInput;
-  let parentCommand;
   let filter = '';
   const domItems = {};
 
   $: selectedIndex = true ? 0 : filter;
+  $: parentCommand = _.isPlainObject($visibleCommandPalette) ? $visibleCommandPalette : null;
 
   onMount(() => {
     const oldFocus = document.activeElement;
@@ -50,7 +50,7 @@
 
   function handleCommand(command) {
     if (command.getSubCommands) {
-      parentCommand = command;
+      $visibleCommandPalette = command;
       domInput.focus();
       filter = '';
       selectedIndex = 0;
diff --git a/packages/web/src/commands/recentDatabaseSwitch.ts b/packages/web/src/commands/recentDatabaseSwitch.ts
index 06ed00814..586f0192a 100644
--- a/packages/web/src/commands/recentDatabaseSwitch.ts
+++ b/packages/web/src/commands/recentDatabaseSwitch.ts
@@ -8,7 +8,7 @@ currentDatabase.subscribe(value => {
   recentDatabases.update(list => {
     const res = [
       value,
-      ..._.compact(list).filter(x => x.name != value.name || x.connection?._id != value.connection?.id),
+      ..._.compact(list).filter(x => x.name != value.name || x.connection?._id != value.connection?._id),
     ].slice(0, 10);
     return res;
   });