diff --git a/elisp/org-setup.el b/elisp/org-setup.el
index 8bf8003..b7a23a5 100644
--- a/elisp/org-setup.el
+++ b/elisp/org-setup.el
@@ -1,10 +1,16 @@
-;; The following lines are always needed.  Choose your own keys.
+;; The following lines are always needed. Choose your own keys.
 ;; Org mode keys
 (global-set-key "\C-cl" 'org-store-link)
 (global-set-key "\C-ca" 'org-agenda)
 (global-set-key "\C-cc" 'org-capture)
 (global-set-key "\C-cb" 'org-iswitchb)
 
+;; Make windmove work in Org mode:
+(add-hook 'org-shiftup-final-hook 'windmove-up)
+(add-hook 'org-shiftleft-final-hook 'windmove-left)
+(add-hook 'org-shiftdown-final-hook 'windmove-down)
+(add-hook 'org-shiftright-final-hook 'windmove-right)
+
 ;; org publish
 (require 'ox-publish)
 (setq org-publish-project-alist
diff --git a/elisp/settings.el b/elisp/settings.el
index 23e4a98..d1688e5 100644
--- a/elisp/settings.el
+++ b/elisp/settings.el
@@ -18,6 +18,9 @@
       show-paren-style 'parenthesis)
 (show-paren-mode 1)
 
+;; Use shift+arrows to jump between windows
+(windmove-default-keybindings)
+
 ;; This is the binary name of my scheme implementation
 (setq scheme-program-name "guile")