diff --git a/.bin/Scripts/functions/tmux.py b/.bin/Scripts/functions/tmux.py
index 8c6ad327..7b4d3455 100644
--- a/.bin/Scripts/functions/tmux.py
+++ b/.bin/Scripts/functions/tmux.py
@@ -143,6 +143,8 @@ def tmux_split_window(
 
 def tmux_switch_client(target_session=None):
   """Switch to target tmux session, or previous if none specified."""
+  # DEPRECATED - Do nothing
+  return
   cmd = ['tmux', 'switch-client']
   if target_session:
     cmd.extend(['-t', target_session])
diff --git a/.bin/Scripts/launch-in-tmux b/.bin/Scripts/launch-in-tmux
index e737b574..e8f84677 100755
--- a/.bin/Scripts/launch-in-tmux
+++ b/.bin/Scripts/launch-in-tmux
@@ -32,6 +32,9 @@ function launch_in_tmux() {
           if [[ -n "${TMUX:-}" ]]; then
               # Running inside TMUX, switch to session
               tmux switch-client -t "$SESSION_NAME"
+              if ! jobs %% >/dev/null 2>&1; then
+                  exit 0
+              fi
           else
               # Running outside TMUX, attach to session
               tmux attach-session -t "$SESSION_NAME"