diff --git a/shell/panelview.cpp b/shell/panelview.cpp
index b5c87bbf7..4be1e26ca 100644
--- a/shell/panelview.cpp
+++ b/shell/panelview.cpp
@@ -859,6 +859,9 @@ void PanelView::moveEvent(QMoveEvent *ev)
     updateEnabledBorders();
     m_strutsTimer.start(STRUTSTIMERDELAY);
     PlasmaQuick::ContainmentView::moveEvent(ev);
+    if (m_screenToFollow && !m_screenToFollow->geometry().contains(geometry())) {
+        positionPanel();
+    }
 }
 
 void PanelView::keyPressEvent(QKeyEvent *event)