diff --git a/src/views/emails.html b/src/views/emails.html
index ed7751a25..8a54f1305 100644
--- a/src/views/emails.html
+++ b/src/views/emails.html
@@ -89,7 +89,7 @@
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
-        <button type="button" class="btn btn-success" ng-click="solrConfig.submit()" ng-disabled="solrConfig.enabled === solrConfig.currentConfig.enabled"><i class="fa fa-circle-notch fa-spin" ng-show="maxEmailSize.busy"></i> {{ 'main.dialog.save' | tr }}</button>
+        <button type="button" class="btn btn-success" ng-click="solrConfig.submit()" ng-disabled="solrConfig.enabled === solrConfig.currentConfig.enabled || solrConfig.busy"><i class="fa fa-circle-notch fa-spin" ng-show="solrConfig.busy"></i> {{ 'main.dialog.save' | tr }}</button>
       </div>
     </div>
   </div>
diff --git a/src/views/emails.js b/src/views/emails.js
index cb713a304..8913ff286 100644
--- a/src/views/emails.js
+++ b/src/views/emails.js
@@ -240,13 +240,13 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
             $scope.solrConfig.busy = true;
 
             Client.setSolrConfig($scope.solrConfig.enabled, function (error) {
-                $scope.solrConfig.busy = false;
-
                 if (error) return console.error(error);
 
-                $scope.solrConfig.refresh();
-
-                $('#solrConfigModal').modal('hide');
+                $timeout(function () {
+                    $scope.solrConfig.busy = false;
+                    $scope.solrConfig.refresh();
+                    $('#solrConfigModal').modal('hide');
+                }, 5000);
             });
         }
     };