diff --git a/.config/herbstluftwm/autostart b/.config/herbstluftwm/autostart
index 4b4add1..c0d8725 100755
--- a/.config/herbstluftwm/autostart
+++ b/.config/herbstluftwm/autostart
@@ -13,6 +13,7 @@ hc set frame_border_width 0
 hc set window_border_width 1
 hc set window_border_normal_color "#15abc3"
 hc set window_border_active_color "#e0c625"
+hc set focus_stealing_prevention 0
 
 # Layout
 hc set default_frame_layout 2
@@ -43,10 +44,6 @@ hc rule windowtype=_NET_WM_WINDOW_TYPE_DIALOG focus=on pseudotile=on
 hc rule class=Xephyr pseudotile=on
 hc rule instance=Xine\ Window pseudotile=on
 
-# Panel
-~/.config/herbstluftwm/panel.sh &
-
-xmodmap ~/.Xmodmap
 xsetroot -solid "#000000"
 emacs --daemon &
 
@@ -57,6 +54,11 @@ then
 fi
 
 xbindkeys
+xmodmap ~/.Xmodmap
+echo test > ~/.xmodmap-errors
+
+# Panel
+~/.config/herbstluftwm/panel.sh &
 
 # Prep default
 hc load default "(split horizontal:0.550000:0 (split vertical:0.850000:0 (split horizontal:0.180000:1 (clients max:0) (clients max:0 0x140001a)) (clients max:0)) (clients max:0 0xc00077))"