diff --git a/src/views/apps.html b/src/views/apps.html
index 669b6587d..7cf905eb8 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -269,9 +269,9 @@
       </div>
       <div class="modal-body" style="padding: 0 15px">
         <p class="text-center" ng-show="appRestore.busyFetching"><i class="fa fa-circle-notch fa-spin"></i> Fetching backups</p>
-        <p ng-hide="appRestore.backups.length">This app has no backups yet.</p>
+        <p ng-hide="appRestore.backups.length || appRestore.creatingBackup">This app has no backups yet.</p>
 
-        <div ng-show="appRestore.app.installationState === 'pending_backup'">
+        <div ng-show="appRestore.creatingBackup">
           <div class="progress progress-striped active animateMe" style="margin-bottom: 10px;">
             <div class="progress-bar progress-bar-success" role="progressbar" style="width: {{appRestore.app.progress}}%"></div>
           </div>
diff --git a/src/views/apps.js b/src/views/apps.js
index dffb9ecbb..bdc2985f7 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -400,6 +400,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         app: {},
         backups: [],
         copyBackupIdDone: false,
+        creatingBackup: false,
 
         copyBackupId: function (backup) {
             var copyText = document.getElementById('appRestoreBackupIdHelper');
@@ -414,6 +415,8 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         },
 
         createBackup: function () {
+            $scope.appRestore.creatingBackup = true;
+
             Client.backupApp($scope.appRestore.app.id, function (error) {
                 if (error) Client.error(error);
 
@@ -425,6 +428,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
                         if (error) return Client.error(error);
 
                         $scope.appRestore.backups = backups;
+                        $scope.appRestore.creatingBackup = false;
                     });
                 }