diff --git a/containments/taskpanel/package/contents/ui/main.qml b/containments/taskpanel/package/contents/ui/main.qml
index ccd68347..bed81535 100644
--- a/containments/taskpanel/package/contents/ui/main.qml
+++ b/containments/taskpanel/package/contents/ui/main.qml
@@ -32,7 +32,8 @@ PlasmaCore.ColorScope {
     height: 480
     colorGroup: PlasmaCore.Theme.ComplementaryColorGroup
 
-    
+    Plasmoid.backgroundHints: plasmoid.configuration.PanelButtonsVisible ? PlasmaCore.Types.StandardBackground : PlasmaCore.Types.NoBackground
+
     property QtObject taskSwitcher: taskSwitcherLoader.item ? taskSwitcherLoader.item : null
     Loader {
         id: taskSwitcherLoader
@@ -95,6 +96,7 @@ PlasmaCore.ColorScope {
             width: 600
             height: 40
 
+            visible: plasmoid.configuration.PanelButtonsVisible
             property Item toolBox
 
             Button {
diff --git a/shell/contents/views/Panel.qml b/shell/contents/views/Panel.qml
index 1dcf3aac..41465369 100644
--- a/shell/contents/views/Panel.qml
+++ b/shell/contents/views/Panel.qml
@@ -22,17 +22,17 @@ import QtQuick.Layouts 1.1
 import org.kde.plasma.core 2.0 as PlasmaCore
 
 
-Rectangle {
+Item {
     id: root
 
     visible: false //adjust borders is run during setup. We want to avoid painting till completed
-    color: theme.textColor
     property Item containment
 
     onContainmentChanged: {
         containment.parent = root;
         containment.visible = true;
         containment.anchors.fill = root;
+        panel.backgroundHints = containment.backgroundHints;
     }
 
     Component.onCompleted: {