diff --git a/src/js/directives/walletBalanceDirective.js b/src/js/directives/walletBalanceDirective.js
index d318b370d..5b2a41b6c 100644
--- a/src/js/directives/walletBalanceDirective.js
+++ b/src/js/directives/walletBalanceDirective.js
@@ -65,19 +65,21 @@
     }
 
     function formatBalance() {
+      var displayAsFiat = $scope.displayAsFiat === 'true';
       var wallet = null;
       try {
         wallet = JSON.parse($scope.wallet);
       } catch (e) {
         $log.error('Error parsing wallet to display balance.', e);
         setDisplay('', '');
+        return;
       }
 
-      if (!$scope.displayAsFiat || $scope.displayAsFiat && !cryptoBalanceHasBeenDisplayed) {
+      if (!displayAsFiat || displayAsFiat && !cryptoBalanceHasBeenDisplayed) {
         displayCryptoBalance(wallet);
       }
 
-      if ($scope.displayAsFiat) {
+      if (displayAsFiat) {
         displayFiatBalance(wallet);
       }
     }
diff --git a/www/views/includes/wallet-balance.html b/www/views/includes/wallet-balance.html
index 03baa8cac..0818bf343 100644
--- a/www/views/includes/wallet-balance.html
+++ b/www/views/includes/wallet-balance.html
@@ -1,3 +1,3 @@
 <div class="wallet-balance-directive">
-  <span>{{displayAmount}}</span><span ng-if="age">{{&middot; (cachedBalanceUpdatedOn  * 1000 | amTimeAgo)}}</span>
+  <formatted-amount value="{{displayAmount}}"></formatted-amount><span ng-if="age">{{&middot; (cachedBalanceUpdatedOn  * 1000 | amTimeAgo)}}</span>
 </div>
\ No newline at end of file
diff --git a/www/views/tab-send.html b/www/views/tab-send.html
index 236c3db6f..a4051b8f1 100644
--- a/www/views/tab-send.html
+++ b/www/views/tab-send.html
@@ -16,7 +16,7 @@
                     ></div>
                 </i>
                 <h2>{{fromWallet.name}}</h2>
-                <wallet-balance display-as-fiat="{{displayBalanceAsFiat}}" wallet="{{fromWallet}}" total-balance-sat={{fromWallet.status.totalBalanceSat}}></wallet-balance>
+                <wallet-balance display-as-fiat={{displayBalanceAsFiat}} wallet={{fromWallet}} total-balance-sat={{fromWallet.status.totalBalanceSat}}></wallet-balance>
                 <!--<p ng-show="vm.origin.balanceAmount">{{vm.origin.balanceAmount}} {{vm.origin.balanceCurrency}}</p>-->
                 <!--<formatted-amount value="{{fromWallet.status.totalBalanceStr ? fromWallet.status.totalBalanceStr : ( fromWallet.cachedBalance ? fromWallet.cachedBalance   + (fromWallet.cachedBalanceUpdatedOn ? ' &middot; ' + ( fromWallet.cachedBalanceUpdatedOn  * 1000 | amTimeAgo) : '') : ''  ) }}"></formatted-amount>-->
               </div>