diff --git a/bin/xss-lock b/bin/xss-lock
index 5a4489d..2e73014 100755
--- a/bin/xss-lock
+++ b/bin/xss-lock
@@ -21,9 +21,14 @@ case "$1" in
     dim|notify)
         echo "notify: start"
         pkill -STOP redshift
-        trap 'pkill -CONT redshift' EXIT
-        trap 'kill %% 2> /dev/null; exit 0' HUP
-        trap 'sleep 1s; kill %% 2> /dev/null; exit 0' TERM
+        current=$(xrandr --verbose | sed -n \
+                                         -e 's/\([^ ]*\) connected .*/--output \1/p' \
+                                         -e 's/\t*Gamma: *\([^ ]\)/--gamma \1/p' \
+                                         -e 's/\t*Brightness: *\([^ ]\)/--brightness \1/p' | \
+                      tr '\n' ' ')
+        trap "echo resume redshift; xrandr $current; pkill -CONT redshift" EXIT
+        trap 'kill %% 2> /dev/null; exit 0' HUP  # user activity
+        trap 'sleep 0.2s; kill %% 2> /dev/null; exit 0' TERM # locker started
         outputs=($(xrandr -q | sed -n 's/\([^ ]*\) connected .*/\1/p'))
         for i in $(seq 0.7 -0.01 0.1); do
             for out in ${outputs[@]}; do