diff --git a/webadmin/src/views/apps.html b/webadmin/src/views/apps.html
index f9643ede6..97bb8eb1b 100644
--- a/webadmin/src/views/apps.html
+++ b/webadmin/src/views/apps.html
@@ -248,7 +248,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Got it</button>
+                <button type="button" class="btn btn-default" data-dismiss="modal" autofocus>Got it</button>
             </div>
         </div>
     </div>
@@ -265,7 +265,7 @@
                 <p>{{ appError.app.message | prettyAppMessage }}</p>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-default pull-left" ng-click="appConfigure.show(appError.app)">Repair</button>
+                <button type="button" class="btn btn-default pull-left" ng-click="appConfigure.show(appError.app)" autofocus>Repair</button>
                 <button type="button" class="btn btn-default" data-dismiss="modal">OK</button>
             </div>
         </div>
diff --git a/webadmin/src/views/apps.js b/webadmin/src/views/apps.js
index b7d2f78c7..fdc60c24d 100644
--- a/webadmin/src/views/apps.js
+++ b/webadmin/src/views/apps.js
@@ -512,7 +512,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
     });
 
     // setup all the dialog focus handling
-    ['appConfigureModal', 'appUninstallModal', 'appUpdateModal', 'appRestoreModal'].forEach(function (id) {
+    ['appConfigureModal', 'appUninstallModal', 'appUpdateModal', 'appRestoreModal', 'appInfoModal', 'appErrorModal'].forEach(function (id) {
         $('#' + id).on('shown.bs.modal', function () {
             $(this).find("[autofocus]:first").focus();
         });