diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index 4030ccbd0..60ec07f89 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -457,7 +457,7 @@
           </div>
         </div>
       </div>
-      <div class="row m20t text-center" ng-show="index.updatingTxHistory">
+      <div class="row m20t text-center" ng-show="index.updatingtxhistory">
         <div class="columns large-12 medium-12 small-12">
           <div class="spinner">
             <div class="rect1"></div>
@@ -521,7 +521,18 @@
           </div>
         </div>
 
-
+        <div class="row m20t text-center" ng-show="index.historyRendering">
+          <div class="columns large-12 medium-12 small-12">
+            <div class="spinner">
+              <div class="rect1"></div>
+              <div class="rect2"></div>
+              <div class="rect3"></div>
+              <div class="rect4"></div>
+              <div class="rect5"></div>
+            </div>
+          </div>
+        </div>
+  
         <div class="row m20t">
           <div class="large-6 medium-6 small-6 columns">
             <button type="submit" class="button black round expand" ng-show="index.historyShowShowAll" ng-click="index.showAllHistory()" ng-style="{'background-color':index.backgroundColor}"  translate>
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 9ef91e941..b9a8f8ae7 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -828,9 +828,13 @@ angular.module('copayApp.controllers').controller('indexController', function($r
   }
   self.showAllHistory = function() {
     self.historyShowShowAll = false;
+    self.historyRendering = true;
     $timeout(function() {
       $rootScope.$apply();
-      self.txHistory = self.completeHistory;
+      $timeout(function() {
+        self.historyRendering = false;
+        self.txHistory = self.completeHistory;
+      });
     });
   };