diff --git a/dashboard/src/views/app.html b/dashboard/src/views/app.html
index 827290ec1..8616dc358 100644
--- a/dashboard/src/views/app.html
+++ b/dashboard/src/views/app.html
@@ -797,15 +797,15 @@
 
         <p><label class="control-label">{{ 'app.info.notes.title' | tr }}</label><i ng-show="!info.notes.editing" class="info-edit-indicator fa fa-pencil-alt" ng-click="info.notes.edit()"></i></p>
         <div class="row">
-          <div class="col-md-12">
+          <div class="col-md-12" ng-show="!info.notes.busy">
             <div ng-show="!info.notes.editing">
               <div ng-show="info.notes.content" ng-bind-html="info.notes.content | markdown2html"></div>
-              <div ng-hide="info.notes.content && !info.notes.busy" class="text-muted hand" ng-click="info.notes.edit()">{{ info.notes.placeholder }}</div>
+              <div ng-show="!info.notes.content" class="text-muted hand" ng-click="info.notes.edit()">{{ info.notes.placeholder }}</div>
             </div>
             <div ng-show="info.notes.editing" class="text-right">
               <textarea id="adminNotesTextarea" ng-trim="false" style="white-space: pre-wrap; margin-bottom: 5px" ng-model="info.notes.content" class="form-control" rows="10"></textarea>
-              <button class="btn btn-default" ng-click="info.notes.dismiss()" ng-disabled="info.notes.busy">{{ 'main.dialog.cancel' | tr }}</button>
-              <button class="btn btn-success" ng-click="info.notes.submit()" ng-disabled="info.notes.busy"><i class="fa fa-circle-notch fa-spin" ng-show="info.notes.busy"></i> {{ 'app.display.saveAction' | tr }}</button>
+              <button class="btn btn-default" ng-click="info.notes.dismiss()" ng-disabled="info.notes.busySave">{{ 'main.dialog.cancel' | tr }}</button>
+              <button class="btn btn-success" ng-click="info.notes.submit()" ng-disabled="info.notes.busySave"><i class="fa fa-circle-notch fa-spin" ng-show="info.notes.busySave"></i> {{ 'app.display.saveAction' | tr }}</button>
             </div>
           </div>
         </div>
diff --git a/dashboard/src/views/app.js b/dashboard/src/views/app.js
index ab6130fcd..703bbc924 100644
--- a/dashboard/src/views/app.js
+++ b/dashboard/src/views/app.js
@@ -142,12 +142,12 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
 
         notes: {
             busy: true,
+            busySave: false,
             editing: false,
             content: '',
             placeholder: 'Add admin notes here...',
 
             edit: function () {
-                $scope.info.notes.busy = false;
                 $scope.info.notes.content = $scope.app.notes;
                 $scope.info.notes.editing = true;
 
@@ -155,13 +155,12 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
             },
 
             dismiss: function () {
-                $scope.info.notes.busy = false;
                 $scope.info.notes.content = $scope.app.notes;
                 $scope.info.notes.editing = false;
             },
 
             submit: function () {
-                $scope.info.notes.busy = true;
+                $scope.info.notes.busySave = true;
 
                 Client.configureApp($scope.app.id, 'notes', { notes: $scope.info.notes.content }, function (error) {
                     if (error) return console.error('Failed to save notes.', error);
@@ -169,8 +168,8 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
                     refreshApp($scope.app.id, function (error) {
                         if (error) return Client.error(error);
 
+                        $scope.info.notes.busySave = false;
                         $scope.info.notes.editing = false;
-                        $scope.info.notes.busy = false;
                     });
                 });
             }