diff --git a/repos/os/src/server/nitpicker/user_state.cc b/repos/os/src/server/nitpicker/user_state.cc
index c08e96cc0..4dcbc0830 100644
--- a/repos/os/src/server/nitpicker/user_state.cc
+++ b/repos/os/src/server/nitpicker/user_state.cc
@@ -57,8 +57,8 @@ void User_state::handle_event(Input::Event ev)
 	/* transparently handle absolute and relative motion events */
 	if (type == Event::MOTION) {
 		if ((ev.rx() || ev.ry()) && ev.ax() == 0 && ev.ay() == 0) {
-			ax = Genode::max(0, Genode::min((int)size().w(), ax + ev.rx()));
-			ay = Genode::max(0, Genode::min((int)size().h(), ay + ev.ry()));
+			ax = Genode::max(0, Genode::min((int)size().w() - 1, ax + ev.rx()));
+			ay = Genode::max(0, Genode::min((int)size().h() - 1, ay + ev.ry()));
 		} else {
 			ax = ev.ax();
 			ay = ev.ay();