diff --git a/src/abstract_client.cpp b/src/abstract_client.cpp
index ea2420c835..16b2c0df8b 100644
--- a/src/abstract_client.cpp
+++ b/src/abstract_client.cpp
@@ -1456,10 +1456,6 @@ void AbstractClient::handleInteractiveMoveResize(int x, int y, int x_root, int y
         }
     }
 
-    if (isInteractiveMove()) {
-        ScreenEdges::self()->check(globalPos, QDateTime::fromMSecsSinceEpoch(xTime(), Qt::UTC));
-    }
-
     Q_EMIT clientStepUserMovedResized(this, moveResizeGeometry());
 }
 
diff --git a/src/events.cpp b/src/events.cpp
index b15aa5734a..116fd8b1a3 100644
--- a/src/events.cpp
+++ b/src/events.cpp
@@ -28,6 +28,7 @@
 #include "unmanaged.h"
 #include "useractions.h"
 #include "effects.h"
+#include "screenedge.h"
 #include "screens.h"
 #include "xcbutils.h"
 
@@ -1046,6 +1047,10 @@ bool X11Client::motionNotifyEvent(xcb_window_t w, int state, int x, int y, int x
     }
 
     handleInteractiveMoveResize(QPoint(x, y), QPoint(x_root, y_root));
+    if (isInteractiveMove()) {
+        ScreenEdges::self()->check(QPoint(x_root, y_root), QDateTime::fromMSecsSinceEpoch(xTime(), Qt::UTC));
+    }
+
     return true;
 }