diff --git a/src/views/app.html b/src/views/app.html
index 8721b7826..56d7bdff5 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -1353,9 +1353,9 @@
           <div class="col-md-12">
             <label class="control-label">{{ 'app.updates.auto.title' | tr }}</label>
             <p>{{ 'app.updates.auto.description' | tr }}</p>
-            <p class="text-success" ng-show="updates.enableAutomaticUpdate">{{ 'app.updates.auto.enabled' | tr }}</p>
-            <p class="text-danger" ng-hide="updates.enableAutomaticUpdate">{{ 'app.updates.auto.disabled' | tr }}</p>
-            <button class="btn btn-primary pull-right" uib-tooltip="{{ app.appStoreId ? '' : 'Not available for custom apps' }}" ng-class="{ 'btn-danger': updates.enableAutomaticUpdate }" ng-click="updates.toggleAutomaticUpdates()" ng-disabled="updates.busyAutomaticUpdates || !app.appStoreId"><i class="fa fa-circle-notch fa-spin" ng-show="updates.busyAutomaticUpdates"></i> {{ updates.enableAutomaticUpdate ? ('app.updates.auto.disableAction' | tr) : ('app.updates.auto.enableAction' | tr) }} </button>
+            <p class="text-success" ng-show="app.enableAutomaticUpdate">{{ 'app.updates.auto.enabled' | tr }}</p>
+            <p class="text-danger" ng-hide="app.enableAutomaticUpdate">{{ 'app.updates.auto.disabled' | tr }}</p>
+            <button class="btn btn-primary pull-right" uib-tooltip="{{ app.appStoreId ? '' : 'Not available for custom apps' }}" ng-class="{ 'btn-danger': app.enableAutomaticUpdate }" ng-click="updates.toggleAutomaticUpdates()" ng-disabled="updates.busyAutomaticUpdates || !app.appStoreId"><i class="fa fa-circle-notch fa-spin" ng-show="updates.busyAutomaticUpdates"></i> {{ app.enableAutomaticUpdate ? ('app.updates.auto.disableAction' | tr) : ('app.updates.auto.enableAction' | tr) }} </button>
           </div>
         </div>
       </div>
diff --git a/src/views/app.js b/src/views/app.js
index 00be484b2..be47a73c6 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -1081,25 +1081,21 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         busyAutomaticUpdates: false,
         skipBackup: false,
 
-        enableAutomaticUpdate: false,
-
         show: function () {
-            var app = $scope.app;
-
-            $scope.updates.enableAutomaticUpdate = app.enableAutomaticUpdate;
             $scope.updates.skipBackup = false;
         },
 
         toggleAutomaticUpdates: function () {
             $scope.updates.busyAutomaticUpdates = true;
 
-            Client.configureApp($scope.app.id, 'automatic_update', { enable: !$scope.updates.enableAutomaticUpdate }, function (error) {
+            Client.configureApp($scope.app.id, 'automatic_update', { enable: !$scope.app.enableAutomaticUpdate }, function (error) {
                 if (error) return Client.error(error);
 
-                $timeout(function () {
-                    $scope.updates.enableAutomaticUpdate = !$scope.updates.enableAutomaticUpdate;
+                refreshApp($scope.app.id, function (error) {
+                    if (error) console.error(error);
+
                     $scope.updates.busyAutomaticUpdates = false;
-                }, 1000);
+                });
             });
         },