diff --git a/public/views/tab-receive.html b/public/views/tab-receive.html
index 54649635c..ebf14d19a 100644
--- a/public/views/tab-receive.html
+++ b/public/views/tab-receive.html
@@ -4,39 +4,32 @@
   </ion-nav-bar>
 
   <ion-content ng-controller="tabReceiveController" ng-init="init()">
-    <div class="text-center m30v" copy-to-clipboard="addr" ng-show="addr">
-      <qrcode size="220" data="bitcoin:{{addr}}" ng-show="addr"></qrcode>
+    <div class="m30v text-center" copy-to-clipboard="addr">
+      <qrcode size="220" data="bitcoin:{{addr}}"></qrcode>
     </div>
 
     <div class="padding assertive" ng-show="error">
       {{error|translate}}
     </div>
 
-    <div ng-show="generatingAddress" class="m30v">
-      <div style="height:220px; width:220px; margin:auto; background: #eee; text-align:center">
-        <div class="padding-top">
-          <ion-spinner class="spinner-dark" icon="lines"></ion-spinner>
-        </div>
-      </div>
-    </div>
-
     <div class="list card padding text-center" ng-if="!wallets[0]">
       <span translate>No Wallet</span>
     </div>
 
     <div class="list" ng-if="wallets[0]">
-      <div class="item item-icon-left" ng-click="shareAddress(addr)" ng-show="isCordova && addr" ng-disabled="generatingAddress">
+      <div class="item item-icon-left" ng-click="shareAddress(addr)" ng-show="isCordova && addr">
         <i class="icon ion-ios-upload-outline"></i>
         <span translate>Share address</span>
       </div>
-      <div class="item item-icon-left" ng-click="setAddress(null, true)" ng-disabled="">
+      <div class="item item-icon-left" ng-click="setAddress(null, true)">
         <i class="icon ion-ios-loop"></i>
         <span translate>Next Address</span>
       </div>
-      <div class="item item-icon-left">
+      <div class="item item-icon-left item-icon-right">
         <i class="icon ion-social-bitcoin-outline"></i>
-        <span ng-show="generatingAddress">...</span>
-        <span ng-show="!generatingAddress" copy-to-clipboard="addr">{{addr}}</span>
+        <span ng-if="generatingAddress">...</span>
+        <span ng-if="!generatingAddress" copy-to-clipboard="addr">{{addr}}</span>
+        <i ng-if="needsBackup" class="icon ion-android-warning assertive"></i>
       </div>
 
       <wallets ng-if="wallets[0]" wallets="wallets"></wallets>
diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js
index c7e2b319b..0b7d04f34 100644
--- a/src/js/controllers/tab-receive.js
+++ b/src/js/controllers/tab-receive.js
@@ -10,38 +10,38 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
     });
     $scope.isCordova = platformInfo.isCordova;
     $scope.isNW = platformInfo.isNW;
+    $scope.needsBackup = false;
   }
 
   $scope.$on('Wallet/Changed', function(event, wallet) {
-    if (lodash.isEmpty(wallet)) {
+    if (!wallet) {
       $log.debug('No wallet provided');
       return;
     }
-    $scope.defaultWallet = wallet;
+    $scope.wallet = wallet;
     $log.debug('Wallet changed: ' + wallet.name);
-    $scope.setAddress(wallet);
+
+    walletService.needsBackup(wallet, function(needsBackup) {
+      if (needsBackup) $scope.needsBackup = true;
+      else $scope.needsBackup = false;
+
+      $scope.setAddress(wallet);
+    });
   });
 
   $scope.shareAddress = function(addr) {
+    if ($scope.needsBackup || $scope.generatingAddress) return;
     if ($scope.isCordova) {
       window.plugins.socialsharing.share('bitcoin:' + addr, null, null, null);
     }
   };
 
   $scope.setAddress = function(wallet, forceNew) {
-    var wallet = wallet || $scope.defaultWallet;
     if ($scope.generatingAddress) return;
 
-    $scope.addr = null;
+    var wallet = wallet || $scope.wallet;
     $scope.error = null;
-
-    if (wallet && !wallet.isComplete()) {
-      $timeout(function() {
-        $scope.$digest();
-      });
-      return;
-    }
-
+    $scope.addr = null;
     $scope.generatingAddress = true;
 
     $timeout(function() {
@@ -53,8 +53,9 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
           if (addr)
             $scope.addr = addr;
         }
-        $scope.$digest();
+
+        $scope.$apply();
       });
-    });
+    }, 1);
   };
 });