diff --git a/modules/fish/default.nix b/modules/fish/default.nix
index 02c6467..9e279be 100644
--- a/modules/fish/default.nix
+++ b/modules/fish/default.nix
@@ -70,7 +70,11 @@
         end
       '';
       sessionizer = /* fish */ ''
-        set -l selected (dev_projects | fzf --prompt "Create/switch to session: " --reverse --header ' Ctrl-d: Kill Session' --bind 'ctrl-d:execute(tmux kill-session -t {2..})++reload(dev_projects)')
+        set -l selected (dev_projects | fzf \
+          --prompt "Create/switch to session: " \
+          --header ' Ctrl-d: Kill Session ' \
+          --bind 'ctrl-d:execute(tmux kill-session -t {2..})++reload(dev_projects)')
+
         if test -z "$selected"
           return 1
         end
@@ -78,12 +82,12 @@
         set -l session_name (basename $selected)
         set -l tmux_runnning (pgrep tmux)
 
-        if test -z $TMUX && -z @tmux_running
+        if test -z $TMUX && -z $tmux_running
           tmux new-session -s $session_name -c $selected
           return 0
         end
 
-        if not tmux has-session -t=$selected_name 2> /dev/null
+        if not tmux has-session -t=$session_name 2> /dev/null
           tmux new-session -ds $session_name -c $selected
         end
 
diff --git a/modules/tmux/default.nix b/modules/tmux/default.nix
index e33e2cb..ca3abcc 100644
--- a/modules/tmux/default.nix
+++ b/modules/tmux/default.nix
@@ -17,6 +17,7 @@
     prefix = "C-b";
     shell = "${pkgs.fish}/bin/fish";
     terminal = "screen-256color";
+    keyMode = "vi";
     plugins = with pkgs; [
       {
         plugin = tmuxPlugins.resurrect;
@@ -55,12 +56,12 @@
       bind ? list-keys -a
 
       unbind s
-      bind-key -r s display-popup -h 50% -w 50% -E sessionizer
+      bind s display-popup -h 50% -w 50% -E sessionizer
 
       unbind v
       bind v choose-tree -Zw "join-pane -t '%%'"
 
-      set -g mode-keys vi
+      bindkey -r '\e/'
     '';
   };
 }