diff --git a/bin/omarchy-cmd-screensaver b/bin/omarchy-cmd-screensaver
index 9ba2ff94..532963c3 100755
--- a/bin/omarchy-cmd-screensaver
+++ b/bin/omarchy-cmd-screensaver
@@ -23,7 +23,7 @@ while true; do
     --no-eol --no-restore-cursor random_effect &
 
   while pgrep -x tte >/dev/null; do
-    if read -n 1 -t 3 || ! screensaver_in_focus; then
+    if read -n 1 -t 1 || ! screensaver_in_focus; then
       exit_screensaver
     fi
   done
diff --git a/bin/omarchy-launch-screensaver b/bin/omarchy-launch-screensaver
index 932ee470..6fa5b2c4 100755
--- a/bin/omarchy-launch-screensaver
+++ b/bin/omarchy-launch-screensaver
@@ -29,6 +29,7 @@ for m in $(hyprctl monitors -j | jq -r '.[] | .name'); do
   *ghostty*)
     hyprctl dispatch exec -- \
       ghostty --class=org.omarchy.screensaver \
+      --config-file=~/.local/share/omarchy/default/ghostty/screensaver \
       --font-size=18 \
       -e omarchy-cmd-screensaver
     ;;
@@ -36,6 +37,7 @@ for m in $(hyprctl monitors -j | jq -r '.[] | .name'); do
     hyprctl dispatch exec -- \
       kitty --class=org.omarchy.screensaver \
       --override font_size=18 \
+      --override window_padding_width=0 \
       -e omarchy-cmd-screensaver
     ;;
   *)
diff --git a/default/ghostty/screensaver b/default/ghostty/screensaver
new file mode 100644
index 00000000..dc359062
--- /dev/null
+++ b/default/ghostty/screensaver
@@ -0,0 +1,3 @@
+window-padding-x = 0
+window-padding-y = 0
+window-padding-color = "extend-always"