diff --git a/bin/omarchy-cmd-screensaver b/bin/omarchy-cmd-screensaver
index d17ff55b..f02a92aa 100755
--- a/bin/omarchy-cmd-screensaver
+++ b/bin/omarchy-cmd-screensaver
@@ -11,7 +11,10 @@ exit_screensaver() {
   exit 0
 }
 
+# Exit the screensaver on signals and input from keyboard and mouse
 trap exit_screensaver SIGINT SIGTERM SIGHUP SIGQUIT
+printf '\e[?1000h\e[?1003h' # Enable mouse tracking (clicks: 1000, movement: 1003)
+while read -rsn1 -t 0.1; do :; done # Flush any pending input
 
 printf '\033]11;rgb:00/00/00\007'  # Set background color to black
 
@@ -24,7 +27,7 @@ while true; do
     --no-eol --no-restore-cursor &
 
   while pgrep -x tte >/dev/null; do
-    if read -n 1 -t 1 || ! screensaver_in_focus; then
+    if read -rsn1 -t 1 || ! screensaver_in_focus; then
       exit_screensaver
     fi
   done