diff --git a/playbooks/roles/shell/templates/tmux.conf.j2 b/playbooks/roles/shell/templates/tmux.conf.j2
index 86f7717..ae4fe13 100644
--- a/playbooks/roles/shell/templates/tmux.conf.j2
+++ b/playbooks/roles/shell/templates/tmux.conf.j2
@@ -1,4 +1,4 @@
-set -g default-terminal "screen-256color"
+set -g default-terminal "tmux-256color"
 set -g default-command "${SHELL}"
 
 set-window-option -g automatic-rename off
@@ -21,6 +21,9 @@ bind < resize-pane -L 2
 bind + resize-pane -U 2
 bind - resize-pane -D 2
 
+bind-key 'C-,' previous-window
+bind-key 'C-.' next-window
+
 bind-key r clear-history
 bind-key R source-file ~/.tmux.conf \; display "Reloaded config file ~/.tmux.conf"
 bind-key b set status