diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml
index 08ad6a5ebc..ffdf0604a0 100644
--- a/resources/qml/Toolbar.qml
+++ b/resources/qml/Toolbar.qml
@@ -68,7 +68,14 @@ Item {
         anchors.left: parent.right;
         y: base.activeY
 
-        width: panel.item ? Math.max(panel.width + 2 * UM.Theme.sizes.default_margin.width) : 0;
+        width: {
+            if (panel.item && panel.width > 0){
+                 return Math.max(panel.width + 2 * UM.Theme.sizes.default_margin.width)
+            }
+            else {
+                return 0
+            }
+        }
         height: panel.item ? panel.height + 2 * UM.Theme.sizes.default_margin.height : 0;
 
         opacity: panel.item ? 1 : 0