diff --git a/js/controllers/addresses.js b/js/controllers/addresses.js
index 3ac7c23ea..3432ef8c5 100644
--- a/js/controllers/addresses.js
+++ b/js/controllers/addresses.js
@@ -76,6 +76,7 @@ angular.module('copayApp.controllers').controller('AddressesController',
 
       if ($rootScope.addrInfos) {
         var addrInfos = $rootScope.addrInfos;
+        $scope.addrLength = addrInfos.length;
         for (var i = 0; i < addrInfos.length; i++) {
           var addrinfo = addrInfos[i];
           $scope.addresses.push({
diff --git a/views/addresses.html b/views/addresses.html
index 0101bd86f..688f3d628 100644
--- a/views/addresses.html
+++ b/views/addresses.html
@@ -4,7 +4,9 @@
       <span translate>Addresses</span>
       <span class="button primary small side-bar" ng-click="newAddr()" ng-disabled="loading"><i class="fi-plus"></i></span>
     </h1> 
-
+    <div ng-show="!addresses[0]">
+        <i class="fi-bitcoin-circle icon-rotate spinner"></i>
+    </div>  
     <div class="large-12 medium-12" ng-if="!!(addresses|removeEmpty).length">
       <div class="large-12 medium-12">
         <div class="oh" ng-repeat="addr in addresses|removeEmpty">
@@ -50,8 +52,7 @@
       </div>
     </div>
 
-
-    <a class="secondary radius" ng-click="toggleShowAll()" ng-show="(addresses|removeEmpty).length == (addresses|removeEmpty).length">
+    <a class="secondary radius" ng-click="toggleShowAll()" ng-show="addrLength > 3">
       <span translate ng-if="!showAll">Show all</span>
       <span translate ng-if="showAll">Show less</span>
     </a>