diff --git a/bin/_locker b/bin/_locker
index 6459453..45a16b5 100755
--- a/bin/_locker
+++ b/bin/_locker
@@ -3,7 +3,7 @@
 set -euo pipefail
 
 if [ "${1-}" = 'dim' ]; then
-    chayang
+    chayang -d 5
 fi
 
 exec swaylock -f -e -F -k -l -c 000000 --indicator-idle-visible
diff --git a/sway/config b/sway/config
index 14daae5..693b75e 100644
--- a/sway/config
+++ b/sway/config
@@ -149,11 +149,12 @@ bar {
 set $locker '_locker'
 set $dimmer '_locker dim'
 set $suspend 'systemctl suspend'
-bindsym $super+Shift+semicolon exec $locker
+bindsym $super+Shift+semicolon exec 'loginctl lock-session'
 # Automatically lock after 5 minutes, suspend after 5 more
 exec swayidle -w \
     timeout 300  $dimmer \
     timeout 600  $suspend \
+    lock         $locker \
     before-sleep $locker
 
 # Only show borders if there's more than one window