diff --git a/.xinitrc b/.xinitrc
index 5d2f72d..16c9ffe 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -25,7 +25,11 @@ eval $(gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh)
 export GNOME_KEYRING_CONTROL GNOME_KEYRING_PID GPG_AGENT_INFO SSH_AUTH_SOCK
 
 (
-	xautolock -noclose -locker '~/bin/screensaver start' -notify 5 -notifier '~/bin/screensaver notify 5' &
+	xautolock \
+		-noclose \
+		-locker '~/bin/screensaver start' \
+		-notify 5 -notifier '~/bin/screensaver notify 5' \
+		-corners 0+-0 -cornerdelay 1 -cornerredelay 300 &
 	dunst &
 	gtk-redshift &
 	skype &
diff --git a/bin/screensaver b/bin/screensaver
index a63cc93..5a20cdc 100755
--- a/bin/screensaver
+++ b/bin/screensaver
@@ -3,10 +3,9 @@
 if [ "$1" = "notify" ]; then
 	# notify-send help says timeout is in milliseconds
 	# but it appears that it is really in seconds (is it a dunst bug?)
-	notify-send -t $[$2-1] "Activating screensaver in $2 seconds..."
+	[ $2 -gt 1 ] && notify-send -t $[$2-1] "Activating screensaver in $2 seconds..."
 else
 	killall -USR1 dunst
-	notify_suspend
 	slock &
 	slock_pid=$!
 	# for xautolock -unlocknow