diff --git a/src/handlers.c b/src/handlers.c
index 81fb8655..8f164cd2 100644
--- a/src/handlers.c
+++ b/src/handlers.c
@@ -199,11 +199,11 @@ int handle_enter_notify(void *ignored, xcb_connection_t *conn, xcb_enter_notify_
                 return 1;
         }
 
-        if (client->container != NULL && client->container->workspace != c_ws) {
+        if (client->workspace != c_ws && client->workspace->screen == c_ws->screen) {
                 /* This can happen when a client gets assigned to a different workspace than
                  * the current one (see src/mainx.c:reparent_window). Shortly after it was created,
                  * an enter_notify will follow. */
-                LOG("enter_notify for a client on a different workspace, ignoring\n");
+                LOG("enter_notify for a client on a different workspace but the same screen, ignoring\n");
                 return 1;
         }