--- a/browser/base/content/syncGenericChange.js
+++ b/browser/base/content/syncGenericChange.js
@@ -142,22 +142,26 @@ let Change = {
     this._statusIcon.removeAttribute("status");
   },
 
   _updateStatus: function Change__updateStatus(str, state) {
      this._updateStatusWithString(this._str(str), state);
   },
   
   _updateStatusWithString: function Change__updateStatusWithString(string, state) {
+    this._statusRow.hidden = false;
+    document.getElementById("passphraseStrengthRow").hidden = true;
     this._status.value = string;
     this._statusIcon.setAttribute("status", state);
 
     let error = state == "error";
     this._dialog.getButton("cancel").setAttribute("disabled", !error);
     this._dialog.getButton("accept").setAttribute("disabled", !error);
+    document.getElementById("printSyncKeyButton").disabled = !error;
+    document.getElementById("saveSyncKeyButton").disabled = !error;
 
     if (state == "success")
       window.setTimeout(window.close, 1500);
   },
 
   onDialogAccept: function() {
     switch (this._dialogType) {
       case "UpdatePassphrase":

--- a/browser/base/content/syncGenericChange.xul
+++ b/browser/base/content/syncGenericChange.xul
@@ -130,20 +130,22 @@
                  onclick="event.stopPropagation();
                           gSyncUtils.openSyncKeyHelp();"
                  value="&syncKeyHelp.label;"/>
         </hbox>
       </vbox>
     </vbox>
 
     <hbox id="passphraseBackupButtons" pack="center">
-      <button label="&button.syncKeyBackup.print.label;"
+      <button id="printSyncKeyButton"
+              label="&button.syncKeyBackup.print.label;"
               accesskey="&button.syncKeyBackup.print.accesskey;"
               oncommand="gSyncUtils.passphrasePrint('passphraseBox');"/>
-      <button label="&button.syncKeyBackup.save.label;"
+      <button id="saveSyncKeyButton"
+              label="&button.syncKeyBackup.save.label;"
               accesskey="&button.syncKeyBackup.save.accesskey;"
               oncommand="gSyncUtils.passphraseSave('passphraseBox');"/>
     </hbox>
 
     <description>
       <html:p class="data" id="warningText"/>
     </description>
   </vbox>