diff --git a/src/app/components/login/save.less b/src/app/components/login/save.less
index 0a27f7ee5..20bfde890 100644
--- a/src/app/components/login/save.less
+++ b/src/app/components/login/save.less
@@ -4,6 +4,8 @@
     font-size: 150%;
     margin-bottom: 30px;
     border: 0;
+    width: 1000px;
+    max-width: 100%;
   }
 
   .missing {
@@ -13,10 +15,10 @@
   }
 }
 
-@media (min-width: 850px) {
+@media (max-width: 550px) {
   .dialog-save {
     .passphrase {
-      width: 800px;
+      height: 6em;
     }
   }
 }
diff --git a/src/app/components/login/save.pug b/src/app/components/login/save.pug
index 61181b987..236ba4350 100644
--- a/src/app/components/login/save.pug
+++ b/src/app/components/login/save.pug
@@ -8,7 +8,7 @@ md-dialog.dialog-save(aria-label='Save your passphrase in a safe place!')
     md-dialog-content
       .md-dialog-content
         div(ng-if="!$ctrl.enter")
-          textarea.passphrase(ng-bind='$ctrl.passphrase', autofocus)
+          textarea.passphrase(ng-bind='$ctrl.passphrase', md-autofocus)
         div(ng-if="$ctrl.enter")
           p.passphrase
             span {{ $ctrl.pre }}
@@ -20,5 +20,5 @@ md-dialog.dialog-save(aria-label='Save your passphrase in a safe place!')
     md-dialog-actions(layout='row')
       md-button(ng-click="$ctrl.close()") Close
       span(flex)
-      md-button(ng-click="$ctrl.next()", md-autofocus, ng-show='!$ctrl.enter') Yes! It's safe!
-      md-button(ng-click="$ctrl.ok()", md-autofocus, ng-show='$ctrl.enter', ng-disabled='!$ctrl.missing_ok') OK
+      md-button(ng-click="$ctrl.next()", ng-show='!$ctrl.enter') Yes! It's safe!
+      md-button(ng-click="$ctrl.ok()", ng-show='$ctrl.enter', ng-disabled='!$ctrl.missing_ok') OK