diff --git a/src/js/directives/formattedAmount.js b/src/js/directives/formattedAmount.js
index f66a0ac78..f81615593 100644
--- a/src/js/directives/formattedAmount.js
+++ b/src/js/directives/formattedAmount.js
@@ -26,9 +26,14 @@
       }
     });
       
-  function formattedAmountController($scope, $timeout, uxLanguage) {
-    $scope.canShow = false;
+  function formattedAmountController($scope, uxLanguage) {
+    $scope.vm = {};
+    var vm = $scope.vm;
 
+    vm.currency = '';
+    vm.value = '';
+    
+    $scope.canShow = false
     $scope.displaySizeEqual = !!$scope.sizeEqual;
 
     var decimalPlaces = {
@@ -90,16 +95,19 @@
       // During watch, may be changed from having a separate currency value,
       // to both being in value. Don't want to use previous currency value.
       // Try to extract currency from value..
-      var currencySplit = $scope.value.split(" ");
-      if (currencySplit.length >= 2 && !$scope.currency) {
-        $scope.currency = currencySplit[currencySplit.length - 1];
+      if (!$scope.currency || $scope.currency.length === 0) {
+        var currencySplit = $scope.value.split(" ");
+        if (currencySplit.length >= 2) {
+          vm.currency = currencySplit[currencySplit.length - 1];
+        }
+      } else {
+        vm.currency = $scope.currency;
       }
-      $scope.currency = $scope.currency || '';
       
       // Redo this when we have proper formatting for low fees
       if ($scope.value.indexOf("<") === 0) {
         buildAmount($scope.value, '', '');
-        $scope.currency = '';
+        vm.currency = '';
         $scope.canShow = true;
         return;
       }
@@ -110,7 +118,7 @@
       var parsed = parseFloat($scope.value);
       var valueFormatted = '';
       var valueProcessing = '';
-      switch (getDecimalPlaces($scope.currency)) {
+      switch (getDecimalPlaces(vm.currency)) {
         case '0':
             if (isNaN(parsed)) {
             buildAmount('-', '', '');
@@ -157,6 +165,7 @@
           break;
       }
       $scope.canShow = true;
+      $scope.$apply();
     };
 
     function getDecimalPlaces(currency) {
diff --git a/www/views/customAmount.html b/www/views/customAmount.html
index b361a6da9..a7130a729 100644
--- a/www/views/customAmount.html
+++ b/www/views/customAmount.html
@@ -32,15 +32,15 @@
       </div>
       <div ng-show="!showingPaymentReceived" class="amount">
         <div ng-show="selectedPriceDisplay=='fiat'">
-          <span class="size-36">{{amountUnitStr}}</span>
+          <span class="size-36"><formatted-amount value="{{amountUnitStr}}"></formatted-amount></span>
           <div class="size-14 amount-alternative">
-            {{altAmountStr | uppercase}}
+            <formatted-amount value="{{altAmountStr | uppercase}}"></formatted-amount>
           </div>
         </div>
         <div ng-show="selectedPriceDisplay=='crypto'">
-          <span class="size-36">{{altAmountStr | uppercase}}</span>
+          <span class="size-36"><formatted-amount value="{{altAmountStr | uppercase}}"></formatted-amount></span>
           <div class="size-14 amount-alternative">
-            {{amountUnitStr}}
+            <formatted-amount value="{{amountUnitStr}}"></formatted-amount>
           </div>
         </div>
       </div>
diff --git a/www/views/includes/formatted-amount.html b/www/views/includes/formatted-amount.html
index 24149849d..45451a718 100644
--- a/www/views/includes/formatted-amount.html
+++ b/www/views/includes/formatted-amount.html
@@ -1,4 +1,4 @@
 <div class="formatted-amount"
   ng-class="{ 'size-equal': displaySizeEqual }" ng-show="canShow">
-  <span ng-if="start.length > 0" class="start">{{start}}</span><span ng-if="middle.length > 0" class="middle">{{middle}}</span><span ng-if="end.length > 0" class="end">{{end}}</span><span ng-if="currency.length > 0" class="currency">{{currency}}</span>
+  <span ng-if="start.length > 0" class="start">{{start}}</span><span ng-if="middle.length > 0" class="middle">{{middle}}</span><span ng-if="end.length > 0" class="end">{{end}}</span><span ng-if="vm.currency.length > 0" class="currency">{{vm.currency}}</span>
 </div>
\ No newline at end of file