diff --git a/bundle/bundle--defaults.el b/bundle/bundle--defaults.el
index 864a94d1..cfdc896c 100644
--- a/bundle/bundle--defaults.el
+++ b/bundle/bundle--defaults.el
@@ -25,7 +25,6 @@
 (setq-default grep-command "grep -i -nH -e ")
 
 ;; Files and sessions
-(when window-system (speedbar t))
 (setq-default auto-save-timeout 60)
 
 ;; Tabs, spaces, lines and parenthesis
diff --git a/bundle/bundle--hooks.el b/bundle/bundle--hooks.el
index 3175db77..f56c955e 100644
--- a/bundle/bundle--hooks.el
+++ b/bundle/bundle--hooks.el
@@ -15,4 +15,5 @@
 (if (display-graphic-p)
     (add-hook 'after-init-hook (lambda ()
                                  (org-agenda-list)
-                                 (me/split-windows-horizontal))))
+                                 (me/split-windows-horizontal)
+                                 (speedbar t))))