diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 7620d4a..f861ff9 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -195,6 +195,16 @@ This is currently the data directory under the
 
 (ido-mode)
 
+;; Add smex, an ido-like M-x alternative
+
+(ensure-library smex)
+
+(with-eval-after-load 'smex
+  (setq smex-save-file (oni:data-location "smex-items")))
+
+(global-set-key (kbd "M-x") 'smex)
+(global-set-key (kbd "M-X") 'smex-major-mode-commands)
+
 ;;;; Minor modes:
 
 ;;;;; Paredit: