diff --git a/packages/web/src/widgets/AppObjectListHandler.svelte b/packages/web/src/widgets/AppObjectListHandler.svelte
index 0e5463df9..f22e02dd8 100644
--- a/packages/web/src/widgets/AppObjectListHandler.svelte
+++ b/packages/web/src/widgets/AppObjectListHandler.svelte
@@ -8,6 +8,7 @@
   export let getSelectedObject;
   export let selectedObjectMatcher;
   export let handleObjectClick;
+  export let handleExpansion = null;
 
   export let onScrollTop = null;
   export let onFocusFilterBox = null;
@@ -81,6 +82,12 @@
         handleObjectClick?.(listInstance[listInstance.length - 1], { tabPreviewMode: true });
       }
     }
+    if (ev.keyCode == keycodes.numPadAdd) {
+      handleExpansion?.(getSelectedObject(), true);
+    }
+    if (ev.keyCode == keycodes.numPadSub) {
+      handleExpansion?.(getSelectedObject(), false);
+    }
 
     if (
       !ev.ctrlKey &&
diff --git a/packages/web/src/widgets/ConnectionList.svelte b/packages/web/src/widgets/ConnectionList.svelte
index 4b84fe07d..be9c06fbb 100644
--- a/packages/web/src/widgets/ConnectionList.svelte
+++ b/packages/web/src/widgets/ConnectionList.svelte
@@ -247,6 +247,12 @@
         }
       }
     }}
+    handleExpansion={(item, value) => {
+      if (item.database) {
+        return;
+      }
+      expandedConnections.update(old => (value ? [...old, item.conid] : old.filter(x => x != item.conid)));
+    }}
   >
     <AppObjectList
       list={connectionsWithParent}