diff --git a/src/plugins/platforms/wayland/qwaylandsurface.cpp b/src/plugins/platforms/wayland/qwaylandsurface.cpp
index 949d7b1609e..274fdda82e5 100644
--- a/src/plugins/platforms/wayland/qwaylandsurface.cpp
+++ b/src/plugins/platforms/wayland/qwaylandsurface.cpp
@@ -15,6 +15,7 @@ QWaylandSurface::QWaylandSurface(QWaylandDisplay *display)
     : wl_surface(display->createSurface(this))
 {
     connect(qApp, &QGuiApplication::screenRemoved, this, &QWaylandSurface::handleScreenRemoved);
+    connect(qApp, &QGuiApplication::screenAdded, this, &QWaylandSurface::screensChanged);
 }
 
 QWaylandSurface::~QWaylandSurface()
@@ -24,7 +25,14 @@ QWaylandSurface::~QWaylandSurface()
 
 QWaylandScreen *QWaylandSurface::oldestEnteredScreen()
 {
-    return m_screens.value(0, nullptr);
+    for (auto *screen : std::as_const(m_screens)) {
+        // only report valid screens
+        // we can have some ouptuts waiting for xdg output information
+        // that are valid QPlatformScreens, but not valid QScreens
+        if (screen->screen())
+            return screen;
+    }
+    return nullptr;
 }
 
 QWaylandSurface *QWaylandSurface::fromWlSurface(::wl_surface *surface)
diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp
index 78244df3d92..4f765f292c5 100644
--- a/src/plugins/platforms/wayland/qwaylandwindow.cpp
+++ b/src/plugins/platforms/wayland/qwaylandwindow.cpp
@@ -557,7 +557,6 @@ QPlatformScreen *QWaylandWindow::calculateScreenFromSurfaceEvents() const
         if (auto *screen = mSurface->oldestEnteredScreen())
             return screen;
     }
-
     return QPlatformWindow::screen();
 }
 
@@ -1440,8 +1439,6 @@ void QWaylandWindow::handleScreensChanged()
     if (newScreen->screen() == window()->screen())
         return;
 
-    if (!newScreen->isPlaceholder() && !newScreen->QPlatformScreen::screen())
-        mDisplay->forceRoundTrip();
     QWindowSystemInterface::handleWindowScreenChanged(window(), newScreen->QPlatformScreen::screen());
 
     if (fixedToplevelPositions && !QPlatformWindow::parent() && window()->type() != Qt::Popup