diff --git a/Cask b/Cask
index 12ec4bd47..f543ea21c 100644
--- a/Cask
+++ b/Cask
@@ -74,6 +74,7 @@
 (depends-on "company")
 (depends-on "company-statistics")
 (depends-on "company-dict" :git "https://github.com/hlissner/emacs-company-dict")
+(depends-on "company-quickhelp")
 
 ;; Yasnippet --- core/core-yasnippet.el
 (depends-on "yasnippet")
diff --git a/core/core-completion.el b/core/core-completion.el
index 999d69b5e..0a16e2108 100644
--- a/core/core-completion.el
+++ b/core/core-completion.el
@@ -21,11 +21,16 @@
                             company-yasnippet
                             company-dabbrev-code)
                            company-dabbrev)
-        company-statistics-file (concat narf-temp-dir "company-stats-cache.el"))
+        company-statistics-file (concat narf-temp-dir "company-stats-cache.el")
+        company-quickhelp-delay nil)
 
   :config
   (require 'company-statistics)
 
+  ;; NOTE: pos-tip.el in Emacs 25+ does not work
+  (require 'company-quickhelp)
+  (company-quickhelp-mode +1)
+
   ;; Rewrites evil-complete to use company-dabbrev
   (setq evil-complete-next-func      'narf/company-evil-complete-next
         evil-complete-previous-func  'narf/company-evil-complete-previous)