diff --git a/src/terminal/Terminal.tsx b/src/terminal/Terminal.tsx
index 89a79049..c159b07a 100644
--- a/src/terminal/Terminal.tsx
+++ b/src/terminal/Terminal.tsx
@@ -177,6 +177,16 @@ const Terminal: React.FC = (_props) => {
         [createContextMenu, xterm],
     );
 
+    useEffect(() => {
+        const listener = () => {
+            xterm.focus();
+        };
+
+        addEventListener('pb-terminal-focus', listener);
+
+        return () => removeEventListener('pb-terminal-focus', listener);
+    }, [xterm]);
+
     return (
         <ContextMenu2
             className="h-100"
diff --git a/src/terminal/sagas.ts b/src/terminal/sagas.ts
index 208c9ee3..0a6442bd 100644
--- a/src/terminal/sagas.ts
+++ b/src/terminal/sagas.ts
@@ -20,7 +20,7 @@ import {
     write,
 } from '../ble-nordic-uart-service/actions';
 import { nordicUartSafeTxCharLength } from '../ble-nordic-uart-service/protocol';
-import { checksum } from '../hub/actions';
+import { checksum, repl } from '../hub/actions';
 import { HubRuntimeState } from '../hub/reducers';
 import { RootState } from '../reducers';
 import { defined } from '../utils';
@@ -94,8 +94,13 @@ function* sendTerminalData(action: ReturnType<typeof sendData>): Generator {
     dataSource.next(action.value);
 }
 
+function handleRepl(): void {
+    dispatchEvent(new CustomEvent('pb-terminal-focus'));
+}
+
 export default function* (): Generator {
     yield* takeEvery(didNotify, receiveUartData);
     yield* fork(receiveTerminalData);
     yield* takeEvery(sendData, sendTerminalData);
+    yield* takeEvery(repl, handleRepl);
 }