diff --git a/bin/omarchy-system-lock b/bin/omarchy-system-lock
index 5ffa2db9..ac62867c 100755
--- a/bin/omarchy-system-lock
+++ b/bin/omarchy-system-lock
@@ -5,7 +5,12 @@
 # omarchy:name=lock
 # omarchy:examples=omarchy system lock
 
-pidof hyprlock || hyprlock &
+if ! pidof hyprlock >/dev/null; then
+  (
+    hyprlock
+    omarchy-system-wake
+  ) &
+fi
 
 # Set keyboard layout to default (first layout)
 hyprctl switchxkblayout all 0 > /dev/null 2>&1
@@ -21,6 +26,6 @@ pkill -f org.omarchy.screensaver
 (
   sleep 10
   pidof hyprlock >/dev/null || exit 0
-  brightnessctl -sd '*::kbd_backlight' set 0 >/dev/null 2>&1
-  hyprctl dispatch dpms off >/dev/null 2>&1
+  omarchy-brightness-keyboard off
+  omarchy-brightness-display off
 ) &