diff --git a/shell/panelconfigview.cpp b/shell/panelconfigview.cpp
index b3bf59895..2da9c3f91 100644
--- a/shell/panelconfigview.cpp
+++ b/shell/panelconfigview.cpp
@@ -49,6 +49,7 @@ PanelConfigView::PanelConfigView(Plasma::Containment *containment, PanelView *pa
     connect(&m_deleteTimer, &QTimer::timeout, this, &PanelConfigView::deleteLater);
 
     m_visibilityMode = panelView->visibilityMode();
+    panelView->setVisibilityMode(PanelView::WindowsGoBelow);
     setScreen(panelView->screen());
     connect(panelView, &QWindow::screenChanged, this,
             [=](QScreen *screen) {
@@ -74,6 +75,7 @@ PanelConfigView::PanelConfigView(Plasma::Containment *containment, PanelView *pa
 
 PanelConfigView::~PanelConfigView()
 {
+    m_panelView->setVisibilityMode(m_visibilityMode);
     PanelShadows::self()->removeWindow(this);
 }
 
@@ -145,6 +147,7 @@ void PanelConfigView::showEvent(QShowEvent *ev)
     }
 
     m_deleteTimer.stop();
+    m_panelView->setVisibilityMode(PanelView::WindowsGoBelow);
     PanelShadows::self()->addWindow(this);
 }
 
@@ -152,6 +155,7 @@ void PanelConfigView::hideEvent(QHideEvent *ev)
 {
     QQuickWindow::hideEvent(ev);
     m_deleteTimer.start();
+    m_panelView->setVisibilityMode(m_visibilityMode);
 
     if (m_containment) {
         m_containment->setUserConfiguring(false);
@@ -170,8 +174,6 @@ void PanelConfigView::setVisibilityMode(PanelView::VisibilityMode mode)
         return;
     }
 
-    m_panelView->setVisibilityMode(mode);
-
     m_visibilityMode = mode;
     emit visibilityModeChanged();
 }