diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index b9e4778..c776804 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -128,8 +128,14 @@
   :mode "\\.pde\\'"
   :mode "\\.ino\\'")
 (use-package company-jedi
-  :config
-  (add-hook 'python-mode-hook (lambda() (add-to-list 'company-backends 'company-jedi))))
+  :init
+  (add-hook 'python-mode-hook (lambda()
+            (add-to-list 'company-backends 'company-jedi)
+            (jedi-mode)))
+  (setq jedi:use-shortcuts t
+		jedi:get-in-function-call-delay 500
+		jedi:tooltip-method nil)
+  :commands (jedi-mode))
 (use-package gnuplot-mode
   :mode ("\\.gp$" . gnuplot-mode))
 (use-package markdown-mode