diff --git a/shell/panelconfigview.cpp b/shell/panelconfigview.cpp
index f7a1456fe..1aafc88f8 100644
--- a/shell/panelconfigview.cpp
+++ b/shell/panelconfigview.cpp
@@ -238,6 +238,8 @@ bool PanelConfigView::event(QEvent *e)
     if (e->type() == QEvent::PlatformSurface) {
         switch (static_cast<QPlatformSurfaceEvent*>(e)->surfaceEventType()) {
         case QPlatformSurfaceEvent::SurfaceCreated:
+            KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager);
+
             if (m_shellSurface) {
                 break;
             }
diff --git a/shell/panelview.cpp b/shell/panelview.cpp
index 184962052..2cdc1e12f 100644
--- a/shell/panelview.cpp
+++ b/shell/panelview.cpp
@@ -587,7 +587,6 @@ void PanelView::showConfigurationInterface(Plasma::Applet *applet)
                     m_panelConfigView->hide();
                 } else {
                     m_panelConfigView->show();
-                    KWindowSystem::setState(m_panelConfigView.data()->winId(), NET::SkipTaskbar | NET::SkipPager);
                 }
                 return;
             }