diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index bb2e2ef..1810b52 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -43,6 +43,12 @@ if type -q git
     alias ga "git add"
 end
 
+if type -q tmux
+    alias tma "tmux attach"
+    alias tmls "tmux list-session"
+    alias tmks "tmux kill-session"
+end
+
 # allow local config overwrite
 set LOCAL_CONFIG (dirname (status --current-file))/config-local.fish
 if test -f $LOCAL_CONFIG
diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
index 3adfe9c..27e424a 100644
--- a/.config/tmux/tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -43,8 +43,7 @@ bind -r - resize-pane -D 5
 bind -r < resize-pane -L 5
 bind -r > resize-pane -R 5
 
-# toggle back and forth between panes
-bind -r . select-pane -t !
+bind -r t last-window
 
 ## basic settings
 set-option -g status-justify "left"