diff --git a/.config/tmux/conf/binds.conf b/.config/tmux/conf/binds.conf
index 7e2bed40..18908325 100644
--- a/.config/tmux/conf/binds.conf
+++ b/.config/tmux/conf/binds.conf
@@ -30,6 +30,12 @@ bind-key r command-prompt -I "#W" "rename-window '%%'"
 bind j switch-client -n
 bind k switch-client -p
 
+# Close a window
+bind-key Q confirm-before kill-window
+
+# Close a pane
+bind-key q confirm-before kill-pane
+
 # Swap windows
 bind -r "<" swap-window -d -t -1
 bind -r ">" swap-window -d -t +1