diff --git a/src/components/LiveGraphPanel.tsx b/src/components/LiveGraphPanel.tsx
index 1b65814da..a8440d086 100644
--- a/src/components/LiveGraphPanel.tsx
+++ b/src/components/LiveGraphPanel.tsx
@@ -19,6 +19,8 @@ import AlertIcon from "./AlertIcon";
 import InfoToolTip from "./InfoToolTip";
 import LiveGraph from "./LiveGraph";
 import PredictedAction from "./PredictedAction";
+import { useHotkeys } from "react-hotkeys-hook";
+import { globalShortcutConfig, keyboardShortcuts } from "../keyboard-shortcuts";
 
 interface LiveGraphPanelProps {
   showPredictedAction?: boolean;
@@ -42,6 +44,10 @@ const LiveGraphPanel = ({
     !isConnected && !isReconnecting && status !== ConnectionStatus.Connecting;
 
   const handleConnectOrReconnect = useCallback(() => {
+    if (isConnected) {
+      // Don't connect if already connected.
+      return;
+    }
     if (
       status === ConnectionStatus.NotConnected ||
       status === ConnectionStatus.Connecting ||
@@ -56,15 +62,29 @@ const LiveGraphPanel = ({
       });
       void actions.reconnect();
     }
-  }, [status, actions, logging]);
+  }, [isConnected, status, actions, logging]);
 
   const handleDisconnect = useCallback(() => {
+    if (!isConnected) {
+      // Don't disconnect if already disconnected.
+      return;
+    }
     logging.event({
       type: "disconnect-user",
     });
     void actions.disconnect();
-  }, [actions, logging]);
+  }, [actions, isConnected, logging]);
   const intl = useIntl();
+  useHotkeys(
+    keyboardShortcuts.connect,
+    handleConnectOrReconnect,
+    globalShortcutConfig
+  );
+  useHotkeys(
+    keyboardShortcuts.disconnect,
+    handleDisconnect,
+    globalShortcutConfig
+  );
   return (
     <HStack
       role="region"
diff --git a/src/keyboard-shortcuts.ts b/src/keyboard-shortcuts.ts
index 5736ee7dc..d2ce0f006 100644
--- a/src/keyboard-shortcuts.ts
+++ b/src/keyboard-shortcuts.ts
@@ -7,6 +7,8 @@ export const keyboardShortcuts = {
   nextAction: ["down"],
   previousAction: ["up"],
   renameAction: ["F2"],
+  connect: ["ctrl+shift+c", "meta+shift+c"],
+  disconnect: ["ctrl+shift+d", "meta+shift+d"],
 };
 
 export const globalShortcutConfig = {