diff --git a/splitLAPTOP b/splitLAPTOP
index 953cfd8..46f7f79 100644
--- a/splitLAPTOP
+++ b/splitLAPTOP
@@ -19,32 +19,37 @@ if-shell -b 'tmux has-session -t toto' {
 	attach-session -t toto:1.1
 }
 # }}}
-# If no session already exists
-if-shell '! tmux has-session -t toto' {
-	display-message "Create a new session for Laptop"
-	# A first window named **mail**
-	# with mutt running in the first pane
-	new-session -A -stoto -nmail 'mutt ; exec ${SHELL}'
-	## Split the first window for APT upgrade
-	split-window -h -p 25 -ttoto:1.1 'sudo aptitude update ; sudo aptitude full-upgrade ; exec ${SHELL}'
-#
-	# Second window named **Xt0p** with btop running
-	new-window -d -nXt0p 'btop ; exec ${SHELL}'
-	# Third window named **ch4t** with weechat running
-	new-window -d -nch4t 'weechat ; exec ${SHELL}'
-	# Fourth window named **git** in main repos directory
-	new-window -d -ngit -c '/home/jegardai/repos'
-	# Fifth window for authentication tools
-	new-window -nAuth 'gpg --quiet --for-your-eyes-only --decrypt ~/.password-store/test.gpg ; logout'
-	split-window -h 'ssh-add -l | grep -qi -- "(ed25519)" || ssh-add ~/.ssh/id_ed25519 ; logout'
-	set-window-option synchronize-panes on
 
-	# Default pane should be toto:5.2
-	#select-pane -ttoto:5.2
+# If file was source from a running tmux
+# This allow to run tmux source-file command outside of Tmux…
+if-shell -b 'test -n $TMUX' {
+	# If no session already exists
+	if-shell '! tmux has-session -t toto' {
+		display-message "Create a new session for Laptop"
+		# A first window named **mail**
+		# with mutt running in the first pane
+		new-session -A -stoto -nmail 'mutt ; exec ${SHELL}'
+		## Split the first window for APT upgrade
+		split-window -h -p 25 -ttoto:1.1 'sudo aptitude update ; sudo aptitude full-upgrade ; exec ${SHELL}'
+	#
+		# Second window named **Xt0p** with btop running
+		new-window -d -nXt0p 'btop ; exec ${SHELL}'
+		# Third window named **ch4t** with weechat running
+		new-window -d -nch4t 'weechat ; exec ${SHELL}'
+		# Fourth window named **git** in main repos directory
+		new-window -d -ngit -c '/home/jegardai/repos'
+		# Fifth window for authentication tools
+		new-window -nAuth 'gpg --quiet --for-your-eyes-only --decrypt ~/.password-store/test.gpg ; logout'
+		split-window -h 'ssh-add -l | grep -qi -- "(ed25519)" || ssh-add ~/.ssh/id_ed25519 ; logout'
+		set-window-option synchronize-panes on
+
+		# Default pane should be toto:5.2
+		#select-pane -ttoto:5.2
+	}
+	# If a default session still exists {{{
+	if-shell -b 'tmux has-session -t 0' {
+		# Kill it
+		kill-session -t 0
+	}
+	# }}}
 }
-# If a default session still exists {{{
-if-shell -b 'tmux has-session -t 0' {
-	# Kill it
-	kill-session -t 0
-}
-# }}}
diff --git a/splitWORK b/splitWORK
index 19bdabf..02d8c2f 100644
--- a/splitWORK
+++ b/splitWORK
@@ -14,23 +14,31 @@
 
 # If a session already exists {{{
 if-shell -b 'tmux has-session -t IPR' {
+	# If file was source from a running tmux
+	#if-shell -b 'test -n $TMUX' {
 	display-message "Attach to **IPR** existing session"
 	## Attach to the first pane of the first window
 	attach-session -t IPR:1.1
+	#}
 }
 # }}}
-# If no session already exists
-if-shell '! tmux has-session -t IPR' {
-	display-message "Create a new session for Work"
-	# A first window named **DeLL**
-	new-session -A -sIPR -nDeLL
 
-	# Second window named **Ceph**
-	new-window -d -nCeph
+# If file was source from a running tmux
+# This allow to run tmux source-file command outside of Tmux…
+if-shell -b 'test -n $TMUX' {
+	# If no session already exists
+	if-shell '! tmux has-session -t IPR' {
+		display-message "Create a new session for Work"
+		# A first window named **DeLL**
+		new-session -A -sIPR -nDeLL
 
-	# Third window named **Prox7**
-	new-window -d -nProx7
+		# Second window named **Ceph**
+		new-window -d -nCeph
 
-	# Default pane should be IPR:1.1
-	#select-pane -tIPR:1.1
+		# Third window named **Prox7**
+		new-window -d -nProx7
+
+		# Default pane should be IPR:1.1
+		#select-pane -tIPR:1.1
+	}
 }