diff --git a/electrum/gui/qml/components/controls/ProxyConfig.qml b/electrum/gui/qml/components/controls/ProxyConfig.qml
index 4e61c716f..9693acbe2 100644
--- a/electrum/gui/qml/components/controls/ProxyConfig.qml
+++ b/electrum/gui/qml/components/controls/ProxyConfig.qml
@@ -38,10 +38,6 @@ Item {
         width: parent.width
         spacing: constants.paddingLarge
 
-        Label {
-            text: qsTr('Proxy settings')
-        }
-
         CheckBox {
             id: proxy_enabled_cb
             text: qsTr('Enable Proxy')
@@ -60,7 +56,7 @@ Item {
         }
 
         GridLayout {
-            columns: 4
+            columns: 2
             Layout.fillWidth: true
 
             Label {
diff --git a/electrum/gui/qml/components/controls/ServerConfig.qml b/electrum/gui/qml/components/controls/ServerConfig.qml
index 4c0102d67..70f6dfe24 100644
--- a/electrum/gui/qml/components/controls/ServerConfig.qml
+++ b/electrum/gui/qml/components/controls/ServerConfig.qml
@@ -14,10 +14,6 @@ Item {
         width: parent.width
         spacing: constants.paddingLarge
 
-        Label {
-            text: qsTr('Server settings')
-        }
-
         CheckBox {
             id: auto_server_cb
             text: qsTr('Select server automatically')
diff --git a/electrum/gui/qml/components/wizard/WCProxyConfig.qml b/electrum/gui/qml/components/wizard/WCProxyConfig.qml
index 2943e1b3d..6a4018ff8 100644
--- a/electrum/gui/qml/components/wizard/WCProxyConfig.qml
+++ b/electrum/gui/qml/components/wizard/WCProxyConfig.qml
@@ -1,3 +1,7 @@
+import QtQuick 2.6
+import QtQuick.Layouts 1.0
+import QtQuick.Controls 2.1
+
 import "../controls"
 
 WizardComponent {
@@ -7,8 +11,17 @@ WizardComponent {
         wizard_data['proxy'] = pc.toProxyDict()
     }
 
-    ProxyConfig {
-        id: pc
+    ColumnLayout {
         width: parent.width
+        spacing: constants.paddingLarge
+
+        Label {
+            text: qsTr('Proxy settings')
+        }
+
+        ProxyConfig {
+            id: pc
+            width: parent.width
+        }
     }
 }
diff --git a/electrum/gui/qml/components/wizard/WCServerConfig.qml b/electrum/gui/qml/components/wizard/WCServerConfig.qml
index 939eb1f06..6d52a3255 100644
--- a/electrum/gui/qml/components/wizard/WCServerConfig.qml
+++ b/electrum/gui/qml/components/wizard/WCServerConfig.qml
@@ -1,3 +1,7 @@
+import QtQuick 2.6
+import QtQuick.Layouts 1.0
+import QtQuick.Controls 2.1
+
 import "../controls"
 
 WizardComponent {
@@ -9,8 +13,17 @@ WizardComponent {
         wizard_data['server'] = sc.address
     }
 
-    ServerConfig {
-        id: sc
+    ColumnLayout {
         width: parent.width
+        spacing: constants.paddingLarge
+
+        Label {
+            text: qsTr('Server settings')
+        }
+
+        ServerConfig {
+            id: sc
+            width: parent.width
+        }
     }
 }