diff --git a/hypr/hypridle.conf b/hypr/hypridle.conf
index b452eab..cc306b8 100644
--- a/hypr/hypridle.conf
+++ b/hypr/hypridle.conf
@@ -2,9 +2,6 @@ general {
     inhibit_sleep = 3
     lock_cmd = pidof hyprlock || ~/.config/hypr/scripts/lock.sh
     before_sleep_cmd = loginctl lock-session
-    # Cycle dpms off/on after resume: forces Hyprland to recreate the hyprlock
-    # surfaces and re-grant them keyboard focus, which is otherwise lost after
-    # suspend (hyprlock shows the clock but ignores typing until a dpms cycle)
     after_sleep_cmd = hyprctl dispatch dpms off && sleep 1 && hyprctl dispatch dpms on
 }
 
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 962572e..e2ff21a 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -181,6 +181,11 @@ misc {
     disable_hyprland_logo = true # If true disables the random hyprland logo / anime girl background. :(
     enable_swallow = true
     font_family = FontAwesome
+
+    # Fix black screen on wake: let the compositor itself re-enable DPMS on input,
+    # as a fallback when hypridle's after_sleep dpms-on runs too early / gets ignored.
+    key_press_enables_dpms = true
+    mouse_move_enables_dpms = true
 }