diff --git a/.tmux.conf b/.tmux.conf
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1,7 +1,6 @@
 set -g default-terminal "screen-256color"
 set -g history-limit 6000
 set -g display-time 4000
-set -g remain-on-exit failed
 
 set -g mouse on
 
@@ -39,7 +38,7 @@ source-file ~/.tmux/vim-keys.conf
 
 bind S choose-session
 bind @ choose-window 'join-pane -h -s "%%"'
-bind K confirm-before -p "kill-pane #P? (y/n)" kill-pane
+bind K kill-pane
 
 if-shell 'test -e ~/.tmux.conf.local' "source ~/.tmux.conf.local"