diff --git a/shell/panelview.h b/shell/panelview.h
--- a/shell/panelview.h
+++ b/shell/panelview.h
@@ -205,6 +205,7 @@
     void adaptToScreen();
     void handleQmlStatusChange(QQmlComponent::Status status);
     void updateMask();
+    void updateEnabledBorders();    
 
 private:
     int readConfigValueWithFallBack(const QString &key, int defaultValue);
@@ -215,7 +216,6 @@
     void setupWaylandIntegration();
     void visibilityModeToWayland();
     bool edgeActivated() const;
-    void updateEnabledBorders();
     bool canSetStrut() const;
 
     int m_offset;
diff --git a/shell/panelview.cpp b/shell/panelview.cpp
--- a/shell/panelview.cpp
+++ b/shell/panelview.cpp
@@ -80,6 +80,7 @@
 
     connect(&m_theme, &Plasma::Theme::themeChanged, this, &PanelView::updateMask);
     connect(this, &PanelView::backgroundHintsChanged, this, &PanelView::updateMask);
+    connect(this, &PanelView::backgroundHintsChanged, this, &PanelView::updateEnabledBorders);
     // TODO: add finished/componentComplete signal to QuickViewSharedEngine,
     // so we exactly know when rootobject is available
     connect(this, &QuickViewSharedEngine::statusChanged,
@@ -1321,12 +1322,7 @@
     }
 
     if (m_enabledBorders != borders) {
-        if (m_backgroundHints == Plasma::Types::NoBackground) {
-            PanelShadows::self()->removeWindow(this);
-        } else {
-            PanelShadows::self()->setEnabledBorders(this, borders);
-        }
-
+        PanelShadows::self()->setEnabledBorders(this, borders);
         m_enabledBorders = borders;
         emit enabledBordersChanged();
     }