diff --git a/.config/sway/config b/.config/sway/config
index 30e019b..e68b74b 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -288,13 +288,15 @@ bindsym $mod+$mod2+Print exec $HOME/.local/bin/swaygrim --all
 # Lockscreen
 # ------------------------------------------------------------------------------
 exec swayidle -w \
-    timeout 30 'makoctl -a away' \
+    timeout 5 'makoctl mode -a away' \
+        resume 'makoctl mode -r away' \
     timeout 300 'swaylock -f' \
-    timeout 600 'swaymsg "output * dpms off"' \
-    resume 'swaymsg "output * dpms on"' \
-    resume 'makoctl -r away' \
+        resume 'makoctl mode -r away' \
     before-sleep 'swaylock -f'
 
+#    timeout 600 'swaymsg "output * dpms off"' \
+#        resume 'swaymsg "output * dpms on" & makoctl mode -r away' \
+
 bindsym control+$mod2+l exec swaylock
 
 # ------------------------------------------------------------------------------