diff --git a/emacs.el b/emacs.el
index 03b6963..a227303 100644
--- a/emacs.el
+++ b/emacs.el
@@ -122,6 +122,7 @@ found, otherwise returns nil."
        fill-column-indicator
        pkgbuild-mode
        minibuffer-line
+       which-key
 
        scala-mode
        ensime
@@ -331,6 +332,9 @@ found, otherwise returns nil."
 (global-set-key (kbd "<eisu-toggle>") 'ignore)
 (global-set-key (kbd "C-<eisu-toggle>") 'ignore)
 
+(when (safe-require-or-eval 'which-key)
+  (which-key-mode))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; editting