diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js
index a3a614e21..79be14391 100644
--- a/src/js/controllers/tab-home.js
+++ b/src/js/controllers/tab-home.js
@@ -224,7 +224,6 @@ angular.module('copayApp.controllers').controller('tabHomeController',
             wallet.error = null;
             wallet.status = status;
 
-            wallet.updating = status && status.wallet && status.wallet.scanStatus == 'running';
             // TODO service refactor? not in profile service
             profileService.setLastKnownBalance(wallet.id, wallet.status.totalBalanceStr, function() {});
           }
@@ -243,7 +242,6 @@ angular.module('copayApp.controllers').controller('tabHomeController',
           return;
         }
         wallet.status = status;
-        wallet.updating = status && status.wallet && status.wallet.scanStatus == 'running';
         updateTxps();
       });
     };
diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js
index b456fae61..15be5ecc0 100644
--- a/src/js/services/walletService.js
+++ b/src/js/services/walletService.js
@@ -305,6 +305,8 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
 
         cacheStatus(status);
 
+        wallet.scanning = status.wallet && status.wallet.scanStatus == 'running';
+
         return cb(null, status);
       });
     };
@@ -818,13 +820,10 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
     $log.debug('Scanning wallet ' + wallet.id);
     if (!wallet.isComplete()) return;
 
-    wallet.updating = true;
-    ongoingProcess.set('scanning', true);
+    wallet.scanning = true;
     wallet.startScan({
       includeCopayerBranches: true,
     }, function(err) {
-      wallet.updating = false;
-      ongoingProcess.set('scanning', false);
       return cb(err);
     });
   };
diff --git a/www/views/tab-home.html b/www/views/tab-home.html
index 9300a598e..0e3e8e33d 100644
--- a/www/views/tab-home.html
+++ b/www/views/tab-home.html
@@ -91,10 +91,10 @@
             Incomplete
           </span>
           <span ng-if="wallet.isComplete()">
-            <span ng-if="!wallet.balanceHidden  && !wallet.updating"> {{wallet.status.totalBalanceStr ? wallet.status.totalBalanceStr : ( wallet.cachedBalance ? wallet.cachedBalance   + (wallet.cachedBalanceUpdatedOn ? ' &middot; ' + ( wallet.cachedBalanceUpdatedOn  * 1000 | amTimeAgo) : '') : ''  ) }} </span>
-            <span ng-if="wallet.updating" translate> Scanning for funds... </span>
+            <span ng-if="!wallet.balanceHidden  && !wallet.scanning"> {{wallet.status.totalBalanceStr ? wallet.status.totalBalanceStr : ( wallet.cachedBalance ? wallet.cachedBalance   + (wallet.cachedBalanceUpdatedOn ? ' &middot; ' + ( wallet.cachedBalanceUpdatedOn  * 1000 | amTimeAgo) : '') : ''  ) }} </span>
+            <span ng-if="wallet.scanning" translate> Scanning for funds... </span>
 
-            <span ng-if="wallet.balanceHidden && !wallet.updating" translate>[Balance Hidden]</span>
+            <span ng-if="wallet.balanceHidden && !wallet.scanning" translate>[Balance Hidden]</span>
             <span class="tab-home__wallet__multisig-number" ng-if="wallet.n > 1">
               {{wallet.m}}-of-{{wallet.n}}
             </span>
diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html
index 2a094e233..6f3756d50 100644
--- a/www/views/walletDetails.html
+++ b/www/views/walletDetails.html
@@ -31,7 +31,7 @@
 
       <div
         ng-click='updateAll(true)'
-        ng-show="!updateStatusError && !wallet.balanceHidden"
+        ng-show="!updateStatusError && !wallet.balanceHidden && !wallet.scanning"
         on-hold="hideToggle()"
         ng-style="{'transform': amountScale}"
         ng-class="{amount__balance: amountIsCollapsible}">
@@ -46,15 +46,26 @@
 
       <div ng-style="{'transform': amountScale}"
       class="amount__balance"
-      ng-show="!updateStatusError && wallet.balanceHidden"
+      ng-show="!updateStatusError && wallet.balanceHidden  && !wallet.scanning"
       on-hold="hideToggle()">
         <strong class="size-24" translate>[Balance Hidden]</strong>
-        <div ng-style="{opacity: altAmountOpacity}" class="size-14 amount-alternative" translate>
+§       <div ng-style="{opacity: altAmountOpacity}" class="size-14 amount-alternative" translate>
           Tap and hold to show
         </div>
       </div>
 
-      <div ng-if="!wallet.balanceHidden && showBalanceButton" ng-style="{'opacity': altAmountOpacity, 'transform': amountScale}">
+
+      <div ng-style="{'transform': amountScale}"
+      class="amount__balance"
+      ng-show="wallet.scanning">
+        <strong class="size-24" translate>[Scanning Funds]</strong>
+        <div ng-style="{opacity: altAmountOpacity}" class="size-14 amount-alternative" translate>
+          Please wait
+        </div>
+      </div>
+
+
+      <div ng-if="!wallet.balanceHidden && !wallet.scanning && showBalanceButton" ng-style="{'opacity': altAmountOpacity, 'transform': amountScale}">
         <button class="button button-standard button-primary amount__button-balance size-14" ng-click="openBalanceModal()">
           <i class="icon ion-ios-checkmark-outline"></i>
           <strong>