diff --git a/app/src/main/java/io/xpipe/app/terminal/TerminalLauncher.java b/app/src/main/java/io/xpipe/app/terminal/TerminalLauncher.java
index abe9fc3e1..731cd7247 100644
--- a/app/src/main/java/io/xpipe/app/terminal/TerminalLauncher.java
+++ b/app/src/main/java/io/xpipe/app/terminal/TerminalLauncher.java
@@ -252,7 +252,7 @@ public class TerminalLauncher {
         // Throw if not supported
         multiplexer.get().checkSupported(control);
 
-        var session = TerminalMultiplexerManager.getActiveMultiplexerSession(true);
+        var session = TerminalMultiplexerManager.getActiveMultiplexerSession();
         if (session.isEmpty()) {
             return false;
         }
diff --git a/app/src/main/java/io/xpipe/app/terminal/TerminalMultiplexerManager.java b/app/src/main/java/io/xpipe/app/terminal/TerminalMultiplexerManager.java
index 6e9570a9b..e0aa4666b 100644
--- a/app/src/main/java/io/xpipe/app/terminal/TerminalMultiplexerManager.java
+++ b/app/src/main/java/io/xpipe/app/terminal/TerminalMultiplexerManager.java
@@ -99,24 +99,12 @@ public class TerminalMultiplexerManager {
             return;
         }
 
-        // Wait if we are currently opening a new multiplexer
+        // Step 1: Wait for currently opening multiplexer container shell
         if (pendingMultiplexerLaunch != null) {
             // Wait for max 30s
             // Multiplexer launches in WSL may take a while
             for (int i = 0; i < 300; i++) {
                 if (pendingMultiplexerLaunch == null) {
-                    // Give it a bit more time if it just started
-                    ThreadHelper.sleep(1000);
-
-                    // Wait for max 10s
-                    for (int j = 0; j < 100; j++) {
-                        if (getActiveMultiplexerSession(false).isPresent()) {
-                            break;
-                        }
-
-                        ThreadHelper.sleep(100);
-                    }
-
                     break;
                 }
 
@@ -126,6 +114,19 @@ public class TerminalMultiplexerManager {
             // We timed out
             pendingMultiplexerLaunch = null;
         }
+
+        // Step 2: Wait for first tab to open in multiplexer container to make sure that the session is started
+        if (runningMultiplexerContainer != null) {
+            // Wait for max 10s
+            for (int j = 0; j < 100; j++) {
+                if (getActiveMultiplexerSession().isPresent()) {
+                    break;
+                }
+
+                ThreadHelper.sleep(100);
+            }
+        }
+
     }
 
     public static void registerSessionLaunch(TerminalLaunchConfiguration configuration) {
@@ -159,24 +160,12 @@ public class TerminalMultiplexerManager {
         return Optional.ofNullable(runningMultiplexerContainer);
     }
 
-    public static Optional<TerminalView.TerminalSession> getActiveMultiplexerSession(boolean includeStarting) {
+    public static Optional<TerminalView.TerminalSession> getActiveMultiplexerSession() {
         var mult = getEffectiveMultiplexer();
         if (mult.isEmpty()) {
             return Optional.empty();
         }
 
-        var noSessions = TerminalView.get().getSessions().stream()
-                .noneMatch(shellSession -> shellSession.getTerminal().isRunning()
-                        && (mult.get() == connectionHubRequests.get(shellSession.getRequest())));
-        if (includeStarting && noSessions) {
-            var starting = TerminalView.get().getSessions().stream()
-                    .filter(shellSession -> shellSession.getTerminal().isRunning()
-                            && runningMultiplexerContainerType == mult.get()
-                            && shellSession.getRequest().equals(runningMultiplexerContainer))
-                    .findFirst();
-            return starting.map(shellSession -> shellSession.getTerminal());
-        }
-
         var session = TerminalView.get().getSessions().stream()
                 .filter(shellSession -> shellSession.getTerminal().isRunning()
                         && (mult.get() == connectionHubRequests.get(shellSession.getRequest())))