diff --git a/home/.config/hypr/hypridle.conf b/home/.config/hypr/hypridle.conf
index 48f05d2..e989fa2 100644
--- a/home/.config/hypr/hypridle.conf
+++ b/home/.config/hypr/hypridle.conf
@@ -11,19 +11,32 @@ general {
 # Warn about going idle (5 mins)
 listener {
   timeout = 300
-  on-timeout = notify-send "HyprIdle" "Going idle in 10 seconds..."
+  # use hyprland notifications, in case dunst notifs are paused or whatever
+  on-timeout = hyprctl notify 0 10000 "rgb(ff0000)" "System going idle in 10 seconds..."
+  # TODO: Add dismissing once https://github.com/hyprwm/Hyprland/pull/4790 is merged
 }
 
-# Lock the session & disable dunst notifications
+# Turn off the screen for 5 seconds
+# I sometimes don't notice the notification, this I always notice
+# and can easily dismiss. However the screen will be turned back on
+# once locked, only turning it off for longer later, since I like
+# seeing my lock screen. Yeah, it's a mess.
 listener {
   timeout = 310
-  on-timeout = loginctl lock-session && dunstctl set-paused true
+  on-timeout = hyprctl dispatch dpms off
+  on-resume = hyprctl dispatch dpms on
+}
+
+# Lock the session & disable dunst notifications & turn screen back on
+listener {
+  timeout = 315
+  on-timeout = hyprctl dispatch dpms on && loginctl lock-session && dunstctl set-paused true
   on-resume = dunstctl set-paused false
 }
 
-# Turn off the screen after another 30s
+# Turn off the screen after another 45s
 listener {
-  timeout = 340
+  timeout = 400
   on-timeout = hyprctl dispatch dpms off
   on-resume = hyprctl dispatch dpms on
 }