diff --git a/mozilla/security/manager/pki/resources/content/pref-masterpass.js b/mozilla/security/manager/pki/resources/content/pref-masterpass.js
index 9d12097d423..4e56beab5ce 100644
--- a/mozilla/security/manager/pki/resources/content/pref-masterpass.js
+++ b/mozilla/security/manager/pki/resources/content/pref-masterpass.js
@@ -50,10 +50,11 @@ function onMasterPasswordLoad()
   case nsIPK11Token.ASK_EXPIRE_TIME: askTimes = 2; break;
   }
   var radiogroup = document.getElementById("passwordAskTimes");
-  var radioitem = radiogroup.childNodes[askTimes];
-  if (askTimes == 2) {
-    // The last radio is a box, because it also has the timeout textbox
-    radioitem = radioitem.firstChild;
+  var radioitem;
+  switch (askTimes) {
+  case 0: radioitem = document.getElementById("askFirstTime"); break;
+  case 1: radioitem = document.getElementById("askEveryTime"); break;
+  case 2: radioitem = document.getElementById("askTimeout"); break;
   }
   radiogroup.selectedItem = radioitem;
   var timeout = internal_token.getAskPasswordTimeout();
diff --git a/mozilla/security/manager/pki/resources/content/pref-masterpass.xul b/mozilla/security/manager/pki/resources/content/pref-masterpass.xul
index 8c9220a482e..4bf9c536907 100644
--- a/mozilla/security/manager/pki/resources/content/pref-masterpass.xul
+++ b/mozilla/security/manager/pki/resources/content/pref-masterpass.xul
@@ -69,23 +69,34 @@
                   flex="1">
         <!-- note that these values are different than what NSS uses, which
              are (0, -1, 1) respectively -->
-        <radio label="&managepassword.askfirsttime;" value="0"
-          id="askFirstTime" group="passwordAskTimes"
-          oncommand="changePasswordSettings();"/>
-        <radio label="&managepassword.askeverytime;" value="1"
-          id="askEveryTime" group="passwordAskTimes"
-          oncommand="changePasswordSettings();"/>
-        <hbox>
-          <radio label="&managepassword.asktimeout;" value="2"
-            id="askTimeout" group="passwordAskTimes"
-            oncommand="changePasswordSettings();"/>
-          <textbox id="passwordTimeout" size="4"
-                   pref="true" preftype="int"
-                   prefstring="security.password_lifetime"
-                   prefattribute="value"
-                   oninput="changePasswordSettings();"/>
-          <text for="timeoutField" value="&managepassword.timeout.unit;"/>
-        </hbox>
+        <grid>
+          <rows>
+            <box>
+              <radio value="0" label="" style="margin: 0px; max-width: 2em;"
+                id="askFirstTime" group="passwordAskTimes"
+                oncommand="changePasswordSettings();"/>
+              <text value="&managepassword.askfirsttime;" style="margin: 4px;"/>
+            </box>
+            <box>
+              <radio value="1" label="" style="margin: 0px; max-width: 2em;"
+                id="askEveryTime" group="passwordAskTimes"
+                oncommand="changePasswordSettings();"/>
+              <text value="&managepassword.askeverytime;" style="margin: 4px;"/>
+            </box>
+            <box>
+              <radio value="2" label="" style="margin: 0px; max-width: 2em;"
+                id="askTimeout" group="passwordAskTimes"
+                oncommand="changePasswordSettings();"/>
+              <text value="&managepassword.asktimeout;" style="margin: 4px;"/>
+              <textbox id="passwordTimeout" size="4"
+                       pref="true" preftype="int"
+                       prefstring="security.password_lifetime"
+                       prefattribute="value"
+                       oninput="changePasswordSettings();"/>
+              <text value="&managepassword.timeout.unit;" style="margin: 4px;"/>
+            </box>
+          </rows>
+        </grid>
       </radiogroup>
     </hbox>
   </groupbox>