diff --git a/src/abstract_client.cpp b/src/abstract_client.cpp
index 1a17f70b80..863512e74a 100644
--- a/src/abstract_client.cpp
+++ b/src/abstract_client.cpp
@@ -63,8 +63,6 @@ AbstractClient::AbstractClient()
 {
     connect(this, &AbstractClient::clientStartUserMovedResized, this, &AbstractClient::moveResizedChanged);
     connect(this, &AbstractClient::clientFinishUserMovedResized, this, &AbstractClient::moveResizedChanged);
-    connect(this, &AbstractClient::clientStartUserMovedResized, this, &AbstractClient::removeCheckOutputConnection);
-    connect(this, &AbstractClient::clientFinishUserMovedResized, this, &AbstractClient::setupCheckOutputConnection);
 
     connect(this, &AbstractClient::windowShown, this, &AbstractClient::hiddenChanged);
     connect(this, &AbstractClient::windowHidden, this, &AbstractClient::hiddenChanged);
@@ -1041,7 +1039,6 @@ void AbstractClient::finishInteractiveMoveResize(bool cancel)
     if (cancel) {
         moveResize(initialInteractiveMoveResizeGeometry());
     }
-    checkOutput(); // needs to be done because clientFinishUserMovedResized has not yet re-activated online alignment
     if (output() != interactiveMoveResizeStartOutput()) {
         workspace()->sendClientToOutput(this, output()); // checks rule validity
         if (isFullScreen() || maximizeMode() != MaximizeRestore) {
diff --git a/src/events.cpp b/src/events.cpp
index f8e4c34a47..68be480435 100644
--- a/src/events.cpp
+++ b/src/events.cpp
@@ -1306,6 +1306,7 @@ void Unmanaged::configureNotifyEvent(xcb_configure_notify_event_t *e)
         m_clientGeometry = newgeom;
         m_frameGeometry = newgeom;
         m_bufferGeometry = newgeom;
+        checkOutput();
         Q_EMIT bufferGeometryChanged(this, old);
         Q_EMIT clientGeometryChanged(this, old);
         Q_EMIT frameGeometryChanged(this, old);
diff --git a/src/internal_client.cpp b/src/internal_client.cpp
index b6903feb69..840d6eb034 100644
--- a/src/internal_client.cpp
+++ b/src/internal_client.cpp
@@ -10,6 +10,7 @@
 #include "internal_client.h"
 #include "decorations/decorationbridge.h"
 #include "deleted.h"
+#include "platform.h"
 #include "surfaceitem.h"
 #include "workspace.h"
 
@@ -472,6 +473,7 @@ void InternalClient::commitGeometry(const QRect &rect)
     // The client geometry and the buffer geometry are the same.
     const QRect oldClientGeometry = m_clientGeometry;
     const QRect oldFrameGeometry = m_frameGeometry;
+    const AbstractOutput *oldOutput = m_output;
 
     m_clientGeometry = frameRectToClientRect(rect);
     m_frameGeometry = rect;
@@ -481,6 +483,7 @@ void InternalClient::commitGeometry(const QRect &rect)
         return;
     }
 
+    m_output = kwinApp()->platform()->outputAt(rect.center());
     syncGeometryToInternalWindow();
 
     if (oldClientGeometry != m_clientGeometry) {
@@ -490,6 +493,9 @@ void InternalClient::commitGeometry(const QRect &rect)
     if (oldFrameGeometry != m_frameGeometry) {
         Q_EMIT frameGeometryChanged(this, oldFrameGeometry);
     }
+    if (oldOutput != m_output) {
+        Q_EMIT screenChanged();
+    }
     Q_EMIT geometryShapeChanged(this, oldFrameGeometry);
 }
 
diff --git a/src/toplevel.cpp b/src/toplevel.cpp
index caf07774da..5d5517c26c 100644
--- a/src/toplevel.cpp
+++ b/src/toplevel.cpp
@@ -47,7 +47,6 @@ Toplevel::Toplevel()
     , m_skipCloseAnimation(false)
 {
     connect(screens(), &Screens::changed, this, &Toplevel::screenChanged);
-    setupCheckOutputConnection();
     connect(this, &Toplevel::bufferGeometryChanged, this, &Toplevel::inputTransformationChanged);
 
     // Only for compatibility reasons, drop in the next major release.
@@ -381,22 +380,6 @@ void Toplevel::deleteEffectWindow()
     effect_window = nullptr;
 }
 
-void Toplevel::checkOutput()
-{
-    setOutput(kwinApp()->platform()->outputAt(frameGeometry().center()));
-}
-
-void Toplevel::setupCheckOutputConnection()
-{
-    connect(this, &Toplevel::frameGeometryChanged, this, &Toplevel::checkOutput);
-    checkOutput();
-}
-
-void Toplevel::removeCheckOutputConnection()
-{
-    disconnect(this, &Toplevel::frameGeometryChanged, this, &Toplevel::checkOutput);
-}
-
 int Toplevel::screen() const
 {
     return kwinApp()->platform()->enabledOutputs().indexOf(m_output);
diff --git a/src/toplevel.h b/src/toplevel.h
index 1c054f82b5..b5e210dddc 100644
--- a/src/toplevel.h
+++ b/src/toplevel.h
@@ -640,13 +640,6 @@ Q_SIGNALS:
     void visibleGeometryChanged();
 
 protected Q_SLOTS:
-    /**
-     * Checks whether the screen number for this Toplevel changed and updates if needed.
-     * Any method changing the geometry of the Toplevel should call this method.
-     */
-    void checkOutput();
-    void setupCheckOutputConnection();
-    void removeCheckOutputConnection();
     void setReadyForPainting();
 
 protected:
@@ -677,6 +670,8 @@ protected:
     void deleteShadow();
     void deleteEffectWindow();
     void setDepth(int depth);
+
+    AbstractOutput *m_output = nullptr;
     QRect m_frameGeometry;
     QRect m_clientGeometry;
     QRect m_bufferGeometry;
@@ -704,7 +699,6 @@ private:
     QRegion opaque_region;
     mutable QRegion m_shapeRegion;
     mutable bool m_shapeRegionIsValid = false;
-    AbstractOutput *m_output = nullptr;
     bool m_skipCloseAnimation;
     quint32 m_pendingSurfaceId = 0;
     QPointer<KWaylandServer::SurfaceInterface> m_surface;
diff --git a/src/unmanaged.cpp b/src/unmanaged.cpp
index 32e2febb90..1aa1a8c4fd 100644
--- a/src/unmanaged.cpp
+++ b/src/unmanaged.cpp
@@ -11,6 +11,7 @@
 
 #include "deleted.h"
 #include "effects.h"
+#include "platform.h"
 #include "surfaceitem_x11.h"
 #include "utils/common.h"
 #include "workspace.h"
@@ -219,6 +220,11 @@ QWindow *Unmanaged::findInternalWindow() const
     return nullptr;
 }
 
+void Unmanaged::checkOutput()
+{
+    setOutput(kwinApp()->platform()->outputAt(frameGeometry().center()));
+}
+
 void Unmanaged::damageNotifyEvent()
 {
     Q_ASSERT(kwinApp()->operationMode() == Application::OperationModeX11);
diff --git a/src/unmanaged.h b/src/unmanaged.h
index a51fcea2b3..180a1e62ba 100644
--- a/src/unmanaged.h
+++ b/src/unmanaged.h
@@ -46,6 +46,7 @@ private:
     void configureNotifyEvent(xcb_configure_notify_event_t *e);
     void damageNotifyEvent();
     QWindow *findInternalWindow() const;
+    void checkOutput();
     void associate();
     void initialize();
     bool m_outline = false;
diff --git a/src/waylandclient.cpp b/src/waylandclient.cpp
index fc57015440..183ac39018 100644
--- a/src/waylandclient.cpp
+++ b/src/waylandclient.cpp
@@ -7,6 +7,7 @@
 */
 
 #include "waylandclient.h"
+#include "platform.h"
 #include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
@@ -287,6 +288,7 @@ void WaylandClient::updateGeometry(const QRect &rect)
     const QRect oldClientGeometry = m_clientGeometry;
     const QRect oldFrameGeometry = m_frameGeometry;
     const QRect oldBufferGeometry = m_bufferGeometry;
+    const AbstractOutput *oldOutput = m_output;
 
     m_clientGeometry = frameRectToClientRect(rect);
     m_frameGeometry = rect;
@@ -308,6 +310,7 @@ void WaylandClient::updateGeometry(const QRect &rect)
         return;
     }
 
+    m_output = kwinApp()->platform()->outputAt(rect.center());
     updateWindowRules(Rules::Position | Rules::Size);
 
     if (changedGeometries & WaylandGeometryBuffer) {
@@ -319,6 +322,9 @@ void WaylandClient::updateGeometry(const QRect &rect)
     if (changedGeometries & WaylandGeometryFrame) {
         Q_EMIT frameGeometryChanged(this, oldFrameGeometry);
     }
+    if (oldOutput != m_output) {
+        Q_EMIT screenChanged();
+    }
     Q_EMIT geometryShapeChanged(this, oldFrameGeometry);
 }
 
diff --git a/src/x11client.cpp b/src/x11client.cpp
index fe5c75073a..780f581519 100644
--- a/src/x11client.cpp
+++ b/src/x11client.cpp
@@ -4177,6 +4177,8 @@ void X11Client::moveResizeInternal(const QRect &rect, MoveResizeMode mode)
     if (pendingMoveResizeMode() == MoveResizeMode::None && m_lastBufferGeometry == m_bufferGeometry && m_lastFrameGeometry == m_frameGeometry && m_lastClientGeometry == m_clientGeometry) {
         return;
     }
+
+    m_output = kwinApp()->platform()->outputAt(frameGeometry.center());
     if (areGeometryUpdatesBlocked()) {
         setPendingMoveResizeMode(mode);
         return;
@@ -4185,6 +4187,7 @@ void X11Client::moveResizeInternal(const QRect &rect, MoveResizeMode mode)
     const QRect oldBufferGeometry = m_lastBufferGeometry;
     const QRect oldFrameGeometry = m_lastFrameGeometry;
     const QRect oldClientGeometry = m_lastClientGeometry;
+    const AbstractOutput *oldOutput = m_lastOutput;
 
     updateServerGeometry();
     updateWindowRules(Rules::Position | Rules::Size);
@@ -4192,6 +4195,7 @@ void X11Client::moveResizeInternal(const QRect &rect, MoveResizeMode mode)
     m_lastBufferGeometry = m_bufferGeometry;
     m_lastFrameGeometry = m_frameGeometry;
     m_lastClientGeometry = m_clientGeometry;
+    m_lastOutput = m_output;
 
     if (isActive()) {
         workspace()->setActiveOutput(output());
@@ -4207,6 +4211,9 @@ void X11Client::moveResizeInternal(const QRect &rect, MoveResizeMode mode)
     if (oldFrameGeometry != m_frameGeometry) {
         Q_EMIT frameGeometryChanged(this, oldFrameGeometry);
     }
+    if (oldOutput != m_output) {
+        Q_EMIT screenChanged();
+    }
     Q_EMIT geometryShapeChanged(this, oldFrameGeometry);
 }
 
diff --git a/src/x11client.h b/src/x11client.h
index 85f712863c..f33e51677b 100644
--- a/src/x11client.h
+++ b/src/x11client.h
@@ -537,6 +537,7 @@ private:
     QMetaObject::Connection m_edgeGeometryTrackingConnection;
 
     QMargins m_clientFrameExtents;
+    AbstractOutput *m_lastOutput = nullptr;
     QRect m_lastBufferGeometry;
     QRect m_lastFrameGeometry;
     QRect m_lastClientGeometry;