diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index ee6f01a3e..354d0b652 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -1874,6 +1874,7 @@ StButton.popup-menu-item:insensitive {
 
 .network-dialog-secret-table {
     spacing-rows: 15px;
+    spacing-columns: 1em;
 }
 
 .keyring-dialog-control-table {
diff --git a/js/ui/networkAgent.js b/js/ui/networkAgent.js
index 8435a0950..f91a4bac5 100644
--- a/js/ui/networkAgent.js
+++ b/js/ui/networkAgent.js
@@ -135,7 +135,10 @@ const NetworkSecretDialog = new Lang.Class({
             } else
                 secret.valid = true;
 
-            secretTable.add(label, { row: pos, col: 0, x_expand: false, x_fill: true, x_align: St.Align.START, y_align: St.Align.START });
+            secretTable.add(label, { row: pos, col: 0,
+                                     x_expand: false, x_fill: true,
+                                     x_align: St.Align.START,
+                                     y_fill: false, y_align: St.Align.MIDDLE });
             secretTable.add(secret.entry, { row: pos, col: 1, x_expand: true, x_fill: true, y_align: St.Align.END });
             pos++;