diff --git a/src/pages/instances/InstanceTerminal.tsx b/src/pages/instances/InstanceTerminal.tsx
index a8cbac1797..adafb7d1db 100644
--- a/src/pages/instances/InstanceTerminal.tsx
+++ b/src/pages/instances/InstanceTerminal.tsx
@@ -141,6 +141,10 @@ const InstanceTerminal: FC<Props> = ({ instance }) => {
     return [data, control];
   };
 
+  useEffect(() => {
+    xtermRef.current?.terminal.focus();
+  }, [xtermRef.current, controlWs]);
+
   useEffect(() => {
     xtermRef.current?.terminal.clear();
     setInTabNotification(null);
diff --git a/src/pages/instances/InstanceTextConsole.tsx b/src/pages/instances/InstanceTextConsole.tsx
index c7e67db89a..df20125df4 100644
--- a/src/pages/instances/InstanceTextConsole.tsx
+++ b/src/pages/instances/InstanceTextConsole.tsx
@@ -118,6 +118,12 @@ const InstanceTextConsole: FC<Props> = ({
     return [data, control];
   };
 
+  useEffect(() => {
+    if (isRunning) {
+      xtermRef.current?.terminal.focus();
+    }
+  }, [isRunning, xtermRef.current]);
+
   useEffect(() => {
     if (dataWs) {
       return;