diff --git a/js/controllers/paymentIntent.js b/js/controllers/paymentIntent.js
index a575383f6..c34a867c6 100644
--- a/js/controllers/paymentIntent.js
+++ b/js/controllers/paymentIntent.js
@@ -4,7 +4,7 @@ angular.module('copayApp.controllers').controller('PaymentIntentController', fun
 
   $scope.wallets = [];
   $rootScope.title = 'Payment intent';
-  $scope.wallets = rootScope.iden.listWallets();
+  $scope.wallets = $rootScope.iden.listAllWallets();
 
   var l = $scope.wallet.length;
   _.each($scope.wallets, function(w, i) {
@@ -39,8 +39,8 @@ angular.module('copayApp.controllers').controller('PaymentIntentController', fun
 
     $scope.cancel = function() {
       $rootScope.pendingPayment = null;
-      $location.path('/');
       $modalInstance.close();
+      $location.path('/homeWallet');
     };
   };
 
diff --git a/views/paymentIntent.html b/views/paymentIntent.html
index 2246aac4b..cd267745a 100644
--- a/views/paymentIntent.html
+++ b/views/paymentIntent.html
@@ -17,8 +17,8 @@
               <div class="w-popup-sub">
                 <span ng-if="item.balanceInfo.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
                 <div ng-if="!item.balanceInfo.updatingBalance" data-options="disable_for_touch:true">
-                  <b class="m5r size-12">{{item.balanceInfo.totalBalance || 0 |noFractionNumber}} {{item.settings.unitName}}</b>
-                  <span class="alt-currency size-10">{{item.balanceInfo.totalBalanceAlternative |noFractionNumber:2}} {{item.balanceInfo.alternativeIsoCode}}</span>
+                  <b class="m5r size-12">{{item.balanceInfo.totalBalance || 0}} {{item.settings.unitName}}</b>
+                  <span class="alt-currency size-10">{{item.balanceInfo.totalBalanceAlternative}} {{item.balanceInfo.alternativeIsoCode}}</span>
                 </div>
               </div>
             </a>