diff --git a/cloneall.bash b/cloneall.bash
index d5a8d6102a29534f2c87efeb2797499c2755d894..08cf0f61059cee843d350f4d2d455a7009b2ccc6 100755
--- a/cloneall.bash
+++ b/cloneall.bash
@@ -63,19 +63,23 @@ if [ ! -z "$tmuxa" ]; then
     
     if ! tmux has-session -t $SESSION_NAME ; then
 	# Create a new tmux session
-	tmux new-session -d -s $SESSION_NAME -c $PWD
 
 	[[ -d full ]] && REPOS+=(full)
 	
 	for index in "${!REPOS[@]}"; do
             value="${REPOS[index]}"
 	    
+	    if [[ "$index" == 0 ]]; then
+		tmux new-session -d -s $SESSION_NAME -c $PWD
+	    else
+		tmux new-window -t $SESSION_NAME -c $PWD
+	    fi
             # Initialize the environment in the first window
             tmux send-keys -t $SESSION_NAME:$index ". .env" C-m
             tmux send-keys -t $SESSION_NAME:$index ". venv/bin/activate" C-m
             tmux send-keys -t $SESSION_NAME:$index "cd $PWD/$value" C-m
 	    tmux rename-window $value
-            tmux new-window -t $SESSION_NAME -c $PWD
+            
 	done
     fi
     tmux attach-session -t $SESSION_NAME