diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf
index c8641d9b..06b3a336 100644
--- a/config/tmux/tmux.conf
+++ b/config/tmux/tmux.conf
@@ -14,6 +14,8 @@ bind -T copy-mode-vi y send -X copy-selection-and-cancel
 # Pane Controls
 bind h split-window -h -c "#{pane_current_path}"
 bind v split-window -v -c "#{pane_current_path}"
+bind End kill-pane
+
 bind -n C-M-PageUp split-window -h -c "#{pane_current_path}"
 bind -n C-M-PageDown split-window -v -c "#{pane_current_path}"
 bind -n C-M-Home split-window -h -c "#{pane_current_path}"
@@ -34,11 +36,11 @@ bind -n C-M-S-Right resize-pane -R 5
 bind r command-prompt -I "#W" "rename-window -- '%%'"
 bind c new-window -c "#{pane_current_path}"
 bind x kill-window
-bind -n C-S-Home new-window -c "#{pane_current_path}"
-bind -n C-S-End kill-window
 
 bind -n C-S-PageUp next-window
 bind -n C-S-PageDown previous-window
+bind -n C-S-Home new-window -c "#{pane_current_path}"
+bind -n C-S-End kill-window
 
 bind -n M-1 select-window -t 1
 bind -n M-2 select-window -t 2
@@ -52,13 +54,15 @@ bind -n M-9 select-window -t 9
 
 # Session controls
 bind R command-prompt -I "#S" "rename-session -- '%%'"
-bind C new-session
+bind C new-session -c "#{pane_current_path}"
 bind X kill-session
-bind -n C-M-S-Home new-session -c "#{pane_current_path}"
-bind -n C-M-S-End kill-session
+bind P switch-client -p
+bind N switch-client -n
 
 bind -n C-M-S-PageUp switch-client -p
 bind -n C-M-S-PageDown switch-client -n
+bind -n C-M-S-Home new-session -c "#{pane_current_path}"
+bind -n C-M-S-End kill-session
 
 # General
 set -g default-terminal "tmux-256color"