diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index 3a357b6..5942a10 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+slock &
 setxkbmap -option altwin:swap_alt_win
 setxkbmap -option ctrl:swapcaps
 xset s off -dpms
diff --git a/.config/fish/functions/start_x_at_login.fish b/.config/fish/functions/start_x_at_login.fish
index 94b20e1..3b77bc6 100644
--- a/.config/fish/functions/start_x_at_login.fish
+++ b/.config/fish/functions/start_x_at_login.fish
@@ -1,7 +1,7 @@
 function start_x_at_login
     if status is-login
         if test -z "$DISPLAY" -a "$XDG_VTNR" = 1
-            exec startx -- -keeptty
+            startx -- -keeptty
         end
     end
 end