diff --git a/config/hypr/hypridle.conf b/config/hypr/hypridle.conf
index 6579248..d769875 100644
--- a/config/hypr/hypridle.conf
+++ b/config/hypr/hypridle.conf
@@ -8,7 +8,7 @@ general {
 
 listener {
     timeout = 60                            # 1min
-    on-timeout = omarchy-launch-screensaver # start screensaver
+    on-timeout = pidof hyprlock || omarchy-launch-screensaver # start screensaver (if we haven't locked already)
 }
 
 listener {
diff --git a/migrations/1754208139.sh b/migrations/1754208139.sh
new file mode 100644
index 0000000..d2f4dd5
--- /dev/null
+++ b/migrations/1754208139.sh
@@ -0,0 +1,4 @@
+echo "Ensure screensaver doesn't start while the computer is locked"
+if ! grep -q "pidof hyprlock || omarchy-launch-screensaver" ~/.config/hypr/hypridle.conf; then
+  omarchy-refresh-hypridle
+fi