diff --git a/src/frontend/src/components/tableComponent/index.tsx b/src/frontend/src/components/tableComponent/index.tsx
index 7c3a540f7..b1f650f16 100644
--- a/src/frontend/src/components/tableComponent/index.tsx
+++ b/src/frontend/src/components/tableComponent/index.tsx
@@ -141,7 +141,6 @@ const TableComponent = forwardRef<
           {...props}
           defaultColDef={{
             minWidth: 100,
-            autoHeight: true,
           }}
           animateRows={false}
           columnDefs={colDef}
diff --git a/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/index.tsx b/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/index.tsx
index 90e442897..8d7036924 100644
--- a/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/index.tsx
+++ b/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/index.tsx
@@ -40,7 +40,7 @@ export default function ShortcutsPage() {
   const combinationToEdit = shortcuts.filter((s) => s.name === selectedRows[0]);
   const [open, setOpen] = useState(false);
   const updateUniqueShortcut = useShortcutsStore(
-    (state) => state.updateUniqueShortcut
+    (state) => state.updateUniqueShortcut,
   );
 
   function handleRestore() {
@@ -97,17 +97,19 @@ export default function ShortcutsPage() {
       </div>
       <div className="grid gap-6 pb-8">
         <div>
-          <TableComponent
-            suppressRowClickSelection={true}
-            domLayout="autoHeight"
-            pagination={false}
-            columnDefs={colDefs}
-            rowData={nodesRowData}
-            onCellDoubleClicked={(e) => {
-              setSelectedRows([e.data.name]);
-              setOpen(true);
-            }}
-          />
+          {colDefs && nodesRowData.length > 0 && (
+            <TableComponent
+              suppressRowClickSelection={true}
+              domLayout="autoHeight"
+              pagination={false}
+              columnDefs={colDefs}
+              rowData={nodesRowData}
+              onCellDoubleClicked={(e) => {
+                setSelectedRows([e.data.name]);
+                setOpen(true);
+              }}
+            />
+          )}
         </div>
       </div>
     </div>