diff --git a/containments/desktop/package/contents/ui/ConfigLocation.qml b/containments/desktop/package/contents/ui/ConfigLocation.qml
--- a/containments/desktop/package/contents/ui/ConfigLocation.qml
+++ b/containments/desktop/package/contents/ui/ConfigLocation.qml
@@ -106,27 +106,17 @@
                 }
 
                 GridLayout {
+                    columnSpacing: 0
+
                     RadioButton {
                         id: locationPlace
 
                         Layout.column: 0
-                        Layout.rowSpan: 2
+                        Layout.columnSpan: 3
                         Layout.alignment: Qt.AlignTop
 
-                        exclusiveGroup: locationGroup
-
-                        onCheckedChanged: {
-                            locationPlaceValue.enabled = checked;
-                        }
-                    }
-
-                    Label {
-                        Layout.row: 0
-                        Layout.column: 1
-                        Layout.alignment: Qt.AlignLeft
-                        Layout.fillWidth: true
-
                         text: i18n("Show a place:")
+                        exclusiveGroup: locationGroup
                     }
 
                     ComboBox {
@@ -135,11 +125,12 @@
                         Layout.row: 1
                         Layout.column: 1
                         Layout.fillWidth: false
+                        Layout.alignment: Qt.AlignLeft
 
                         model: placesModel
                         textRole: "display"
 
-                        enabled: true
+                        enabled: locationPlace.checked
 
                         onEnabledChanged: {
                             if (enabled && currentIndex != -1) {
@@ -154,23 +145,17 @@
                 }
 
                 GridLayout {
+                    columnSpacing: 0
+
                     RadioButton {
                         id: locationCustom
 
                         Layout.column: 0
-                        Layout.rowSpan: 2
+                        Layout.columnSpan: 4
                         Layout.alignment: Qt.AlignTop
 
-                        exclusiveGroup: locationGroup
-                    }
-
-                    Label {
-                        Layout.row: 0
-                        Layout.column: 1
-                        Layout.alignment: Qt.AlignLeft
-                        Layout.fillWidth: true
-
                         text: i18n("Specify a folder:")
+                        exclusiveGroup: locationGroup
                     }
 
                     TextField {
@@ -198,6 +183,9 @@
                     }
 
                     Button {
+                        Layout.row: 1
+                        Layout.column: 2
+
                         iconName: "document-open"
 
                         enabled: locationCustom.checked