diff --git a/resources/qml/ExpandableComponent.qml b/resources/qml/ExpandableComponent.qml
index d4eb18f4fa..8ed6dc5674 100644
--- a/resources/qml/ExpandableComponent.qml
+++ b/resources/qml/ExpandableComponent.qml
@@ -85,7 +85,7 @@ Item
             anchors
             {
                 left: parent.left
-                right: collapseButton.left
+                right: collapseButton.visible ? collapseButton.left : parent.right
                 top: parent.top
                 bottom: parent.bottom
                 margins: background.padding