diff --git a/X/.xinitrc b/X/.xinitrc
index 14b9bc9..9ea49b8 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -1,8 +1,5 @@
 # Allow inclusion of home directories in ~/.Xresources
 xrdb -I$HOME ~/.Xresources
 
-# Autolock after 1 minute without any input, lock on upper-left, don't in lower-right
-xautolock -time 1 -cornerredelay 5 -corners +00- -locker "~/scripts/i3exit lock" &
-
 # Launch i3
 exec i3
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index a1918d4..e829a8a 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -227,6 +227,8 @@ exec --no-startup-id redshift-gtk
 exec --no-startup-id dunst
 # Notify when battery is at 15% and 5% percent
 exec --no-startup-id i3-battery-popup -n -L 15 -l 5
+# Autolock after 1 minute without any input, lock on upper-left, don't in lower-right
+exec --no-startup-id xautolock -time 1 -cornerredelay 5 -corners +00- -locker "~/scripts/i3exit lock"
 
 # Set the wallpaper
 exec --no-startup-id feh --bg-fill ~/Pictures/wallpapers/starry-night-tree.png