diff --git a/.config.d/05-basic.el b/.config.d/05-basic.el
index b536a26..0cdc245 100644
--- a/.config.d/05-basic.el
+++ b/.config.d/05-basic.el
@@ -96,4 +96,11 @@
 ;; into kill ring before replacing it.
 (setq save-interprogram-paste-before-kill t)
 
+;; Windmove family of commands allow easy navigation when there is more than two
+;; buffers on screen.
+(global-set-key (kbd "C-S-<left>") 'windmove-left)
+(global-set-key (kbd "C-S-<right>") 'windmove-right)
+(global-set-key (kbd "C-S-<up>") 'windmove-up)
+(global-set-key (kbd "C-S-<down>") 'windmove-down)
+
 ;;; 05-basic.el ends here