diff --git a/modules/fish/default.nix b/modules/fish/default.nix
index fac5a87..8d27a5c 100644
--- a/modules/fish/default.nix
+++ b/modules/fish/default.nix
@@ -78,7 +78,7 @@
         set -l session_name (basename $selected)
         set -l tmux_runnning (pgrep tmux)
 
-        if test -z $TMUX and -z @tmux_running
+        if test -z $TMUX && -z @tmux_running
           tmux new-session -s $selected_name -c $selected
           return 0
         end
diff --git a/modules/tmux/default.nix b/modules/tmux/default.nix
index bc944de..922cd1c 100644
--- a/modules/tmux/default.nix
+++ b/modules/tmux/default.nix
@@ -55,10 +55,10 @@
       bind ? list-keys -a
 
       unbind s
-      bind s display-popup -h 50% -w 50% -E sessionizer
+      bind-key -r s "display-popup -h 50% -w 50% -E sessionizer"
 
-      unbind "+"
-      bind "+" choose-tree -Zw "join-pane -t '%%'"
+      unbind v
+      bind v choose-tree -Zw "join-pane -t '%%'"
 
       set -g mode-keys vi
     '';