diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 5105521..5708307 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -35,6 +35,7 @@
   (scroll-bar-mode -1))
 (column-number-mode t)
 (line-number-mode t)
+(desktop-save-mode t)
 
 ;; Command rebinding
 
@@ -74,6 +75,11 @@
       (ansi-color-apply-on-region compilation-filter-start (point-max))))
   (add-hook 'compilation-filter-hook 'my-colorize-compilation-buffer))
 
+;; Retrieve PATH from fish shell
+(when (memq window-system '(mac ns x))
+  (setq exec-path-from-shell-shell-name "/usr/local/bin/fish")
+  (exec-path-from-shell-initialize))
+
 ;; Auto complete + Yasnippet
 
 (use-package sr-speedbar