diff --git a/init.el b/init.el
index 275d44510..a0db1aeb5 100644
--- a/init.el
+++ b/init.el
@@ -22,6 +22,7 @@
 
     ;; editor packages
     ace-jump-mode
+    ace-window
     ag
     browse-kill-ring
     cargo
diff --git a/init/bindings.el b/init/bindings.el
index 2e37469df..bb030f1bc 100644
--- a/init/bindings.el
+++ b/init/bindings.el
@@ -16,6 +16,9 @@
 (global-set-key (kbd "M-j") 'ace-jump-word-mode)
 (global-set-key (kbd "M-p") 'ace-jump-mode-pop-mark)
 
+(global-set-key (kbd "C-x o") ; Yes, I went there!
+                'ace-window)
+
 ;; Window switching. (C-x o goes to the next window)
 (windmove-default-keybindings) ;; Shift+direction
 
diff --git a/init/custom.el b/init/custom.el
index 0613cd781..c1276f7ea 100644
--- a/init/custom.el
+++ b/init/custom.el
@@ -18,7 +18,7 @@
  '(ns-right-command-modifier (quote meta))
  '(package-selected-packages
    (quote
-    (exwm which-key pandoc elnode fish-mode nix-mode yaml-mode undo-tree terraform-mode switch-window smart-mode-line rust-mode rainbow-mode rainbow-delimiters puppet-mode pkgbuild-mode password-store paredit multi-term multiple-cursors markdown-mode+ magit iy-go-to-char idle-highlight-mode hi2 helm haskell-mode gruber-darker-theme go-mode flycheck erlang dockerfile-mode confluence browse-kill-ring ag ace-jump-mode)))
+    (ace-window exwm which-key pandoc elnode fish-mode nix-mode yaml-mode undo-tree terraform-mode switch-window smart-mode-line rust-mode rainbow-mode rainbow-delimiters puppet-mode pkgbuild-mode password-store paredit multi-term multiple-cursors markdown-mode+ magit iy-go-to-char idle-highlight-mode hi2 helm haskell-mode gruber-darker-theme go-mode flycheck erlang dockerfile-mode confluence browse-kill-ring ag ace-jump-mode)))
  '(require-final-newline (quote visit-save)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
diff --git a/init/modes.el b/init/modes.el
index 795e75365..4ce32ae30 100644
--- a/init/modes.el
+++ b/init/modes.el
@@ -58,4 +58,7 @@
 ;; Show available key chord completions
 (which-key-mode t)
 
+;; Show previews of ace-window numbers in the mode line for each window.
+(ace-window-display-mode)
+
 (provide 'modes)