diff --git a/shell/panelview.cpp b/shell/panelview.cpp
--- a/shell/panelview.cpp
+++ b/shell/panelview.cpp
@@ -701,7 +701,6 @@
 
 void PanelView::showEvent(QShowEvent *event)
 {
-    PanelShadows::self()->addWindow(this, enabledBorders());
     PlasmaQuick::ContainmentView::showEvent(event);
 
     integrateScreen();
@@ -856,6 +855,7 @@
                 switch (pe->surfaceEventType()) {
                 case QPlatformSurfaceEvent::SurfaceCreated:
                     setupWaylandIntegration();
+                    PanelShadows::self()->addWindow(this, enabledBorders());
                     break;
                 case QPlatformSurfaceEvent::SurfaceAboutToBeDestroyed:
                     delete m_shellSurface;