2 files changed, 6 insertions, 2 deletions
diff --git a/shell b/shell
index df569e9..84e95d7 100755
--- a/shell
+++ b/shell
@@ -60,7 +60,11 @@ fi
 window_title $DEST
 
 # Shift args
-shift 2
+if [ -z "$COMMAND" ]; then
+  shift
+else
+  shift 2
+fi
 
 # Dispatcher
 if [ "$BASENAME" == "shells" ]; then
diff --git a/wtmux b/wtmux
index aa48386..b577fd8 100755
--- a/wtmux
+++ b/wtmux
@@ -43,7 +43,7 @@ if [ ! -z "${name}" ]; then
     fi
   fi
 
-  if [ -z "$state" ] || [ "$state" == "attached" ]; then
+  if [ "$state" != "detached" ]; then
     tmux attach -t ${name}
   fi
 else