diff --git a/key-bindings.el b/key-bindings.el
index 1eca1d2..a0177a4 100644
--- a/key-bindings.el
+++ b/key-bindings.el
@@ -8,6 +8,7 @@
 (global-set-key (kbd "C-c C-<") 'mc/mark-all-like-this)
 
 (global-set-key (kbd "C-c SPC") 'ace-jump-mode)
+(global-set-key (kbd "C-x o") 'ace-window)
 
 ;; http://whattheemacsd.com/key-bindings.el-03.html
 
diff --git a/load-packages.el b/load-packages.el
index 484c61d..192e037 100644
--- a/load-packages.el
+++ b/load-packages.el
@@ -67,6 +67,7 @@
     enh-ruby-mode
     flymake-ruby
     company
+    ace-window
 
     ;; from prelude
     ace-jump-mode