diff --git a/js/controllers/receive.js b/js/controllers/receive.js
index 8f5038f83..39ec611b2 100644
--- a/js/controllers/receive.js
+++ b/js/controllers/receive.js
@@ -6,8 +6,9 @@ angular.module('copayApp.controllers').controller('ReceiveController',
     $scope.newAddr = function() {
       var w = $rootScope.wallet;
       $scope.loading = true;
-      w.generateAddress(null);
+      var lastAddr = w.generateAddress(null);
       $scope.setAddressList();
+      $scope.addr = lastAddr;
       $timeout(function() {
         $scope.loading = false;
       }, 1);
@@ -20,10 +21,10 @@ angular.module('copayApp.controllers').controller('ReceiveController',
       var w = $rootScope.wallet;
       var lastAddr = _.first(w.getAddressesOrderer()); 
       var balance = w.balanceInfo.balanceByAddr;
+      $scope.setAddressList();
 
       while (balance && balance[lastAddr] > 0) {
         $scope.loading = true;
-        $scope.newAddr();
         lastAddr = w.generateAddress(null);
       };
       $scope.loading = false;
diff --git a/views/receive.html b/views/receive.html
index ca7f7ddcd..3ebe3dcff 100644
--- a/views/receive.html
+++ b/views/receive.html
@@ -26,7 +26,7 @@
     </div>
   </div>
   <div class="row">
-    <div class="large-12 columns" ng-if="addresses.length">
+    <div class="large-12 columns" ng-if="showAll">
       <div ng-repeat="addr in addresses" ng-click="openAddressModal(addr)" class="pointer">
         <div class="panel">
           <div class="row">
@@ -48,20 +48,16 @@
           <!-- end of panel mobile -->
         </div>
       </div>
+    </div>
+    <div class="large-12 columns">
       <a class="button secondary tiny text-center right" ng-click="newAddr()" ng-disabled="loading">
-          Generate new address
+        Generate new address
       </a>
       <a class="button secondary tiny text-center" ng-click="toggleShowAll()" ng-disabled="loading">
-        <span translate ng-if="showAll">Hide them</span>
+        <span ng-show="!showAll" translate>Show all my addresses</span>
+        <span ng-show="showAll" translate>Hide them</span>
       </a>
     </div>
-    <div class="large-12 columns" ng-if="!showAll">
-      <div class="m20b">
-        <a class="button secondary tiny text-center" ng-click="toggleShowAll()" ng-disabled="loading">
-          <span translate>Show all my addresses</span>
-        </a>
-      </div>
-    </div>
   </div>
 </div>