diff --git a/www/js/controllers/wallets-controllers.js b/www/js/controllers/wallets-controllers.js
index f61b50376cbd2d8ea3e1c03d04267f9b1200ab56..f6306fc47be7af1ce8035f5612e37f804ecdee3d 100644
--- a/www/js/controllers/wallets-controllers.js
+++ b/www/js/controllers/wallets-controllers.js
@@ -620,8 +620,10 @@ function WalletSelectModalController($scope, $q, $timeout, UIUtils, filterTransl
 
   // Clean controller data
   $scope.resetData = function() {
+    console.debug("[wallets] Cleaning wallet list");
     $scope.wallets = null;
     $scope.loading = true;
+    $scope.entered = false;
     $scope.formData.balance = undefined;
     $scope.formData.updatingWalletId = undefined;
   };
diff --git a/www/templates/wallet/list/item_wallet.html b/www/templates/wallet/list/item_wallet.html
index 223151db94ca4be2697b05357af69876448eae59..8e1072ea3724f7a7290c11454e46800280e31f0b 100644
--- a/www/templates/wallet/list/item_wallet.html
+++ b/www/templates/wallet/list/item_wallet.html
@@ -27,7 +27,7 @@
 
   <cs-extension-point name="item-wallet"></cs-extension-point>
 
-  <span class="badge" ng-if="formData.showBalance"
+  <span class="badge" ng-if=":rebind:formData.showBalance && walletData.loaded"
         ng-class=":rebind:{'badge-assertive': (walletData.balance <= 0), 'badge-balanced': (walletData.balance > 0) }">
     <ion-spinner class="ion-spinner-small" ng-if="formData.updatingWalletId==wallet.id" icon="android"></ion-spinner>
     <span ng-bind-html=":rebind:walletData.balance|formatAmount:{useRelative: formData.useRelative, currency: currency}"></span>