diff --git a/bin/xss-lock b/bin/xss-lock
index c49e0ec..b9c0a38 100755
--- a/bin/xss-lock
+++ b/bin/xss-lock
@@ -13,11 +13,12 @@ case "$1" in
     dim)
         echo "$me: dim: start"
         trap 'exit 0' TERM INT
-        trap "xbacklight -steps 1 -set $(xbacklight -get); kill %%" EXIT
+        trap "kill %% ; wait ; xbacklight -steps 1 -set $(xbacklight -get)" EXIT
         min_brightness=0
-        fade_time=$(($notify * 800))
+        fade_time=$(($notify * 1000))
         fade_steps=100
-        xbacklight -time $fade_time -steps $fade_steps -set $min_brightness
+        xbacklight -time $fade_time -steps $fade_steps -set $min_brightness &
+        wait
         echo "$me: dim: end"
         sleep 2147483647 &
         wait