diff --git a/declarativeimports/plasmacomponents/qml/ToolBarLayout.qml b/declarativeimports/plasmacomponents/qml/ToolBarLayout.qml
index be51e2bff..47bf2e9f2 100644
--- a/declarativeimports/plasmacomponents/qml/ToolBarLayout.qml
+++ b/declarativeimports/plasmacomponents/qml/ToolBarLayout.qml
@@ -50,7 +50,7 @@ Row {
             layouting = true
             spacer.parent = null
 
-            spacer.width = root.parent.width - root.childrenRect.width
+            spacer.width = root.parent.width - root.childrenRect.width -10
 
             var last = root.children[numChildren-2]
             last.parent = null
diff --git a/declarativeimports/test/gallery/Gallery.qml b/declarativeimports/test/gallery/Gallery.qml
index 68e2e9e65..f1f536d60 100644
--- a/declarativeimports/test/gallery/Gallery.qml
+++ b/declarativeimports/test/gallery/Gallery.qml
@@ -47,7 +47,7 @@ Rectangle {
             text: "button on first toolbar"
         }
     }
-    Row {
+    PlasmaComponents.ToolBarLayout {
         id: toolbarB
         visible: false
         spacing: 5