diff --git a/src/js/directives/amount.js b/src/js/directives/amount.js
index a23069157..9622ca09d 100644
--- a/src/js/directives/amount.js
+++ b/src/js/directives/amount.js
@@ -23,7 +23,7 @@ angular.module('bitcoincom.directives')
       },
       templateUrl: 'views/includes/amount.html',
       controller: ['$scope', function($scope) {
-        if (typeof $scope.sizeEqual == 'undefined') $scope.sizeEqual = false;
+        $scope.displaySizeEqual = typeof $scope.sizeEqual == 'undefined' ? false : true;
 
         var decimalPlaces = {
           '0': ['BIF', 'CLP', 'DJF', 'GNF', 'ILS', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'UGX', 'VND', 'VUV', 'XAF', 'XOF', 'XPF'],
@@ -48,37 +48,44 @@ angular.module('bitcoincom.directives')
           return '2';
         };
 
-        switch (getDecimalPlaces($scope.currency)) {
-          case '0':
-            var valueFormatted = numberWithCommas(Math.round(parseFloat($scope.value)));
-            buildAmount(valueFormatted, '', '');
-            break;
-
-          case '2':
-            var valueProcessing = parseFloat(parseFloat($scope.value).toFixed(2));
-            var valueFormatted = numberWithCommas(valueProcessing);
-            buildAmount(valueFormatted, '', '');
-            break;
-
-          case '3':
-            var valueProcessing = parseFloat(parseFloat($scope.value).toFixed(3));
-            var valueFormatted = numberWithCommas(valueProcessing);
-            buildAmount(valueFormatted, '', '');
-            break;
-
-          case '8':
-            var valueFormatted = parseFloat($scope.value).toFixed(8);
-            if (parseFloat($scope.value) == 0) {
-              buildAmount('0', '', '');
-            } else {
+        var formatNumbers = function(currency, value) {
+          switch (getDecimalPlaces(currency)) {
+            case '0':
+              var valueFormatted = numberWithCommas(Math.round(parseFloat(value)));
               buildAmount(valueFormatted, '', '');
-              var start = numberWithCommas(valueFormatted.slice(0, -5));
-              var middle = valueFormatted.slice(-5, -2);
-              var end = valueFormatted.substr(valueFormatted.length - 2);
-              buildAmount(start, middle, end);
-            }
-            break;
+              break;
+  
+            case '2':
+              var valueProcessing = parseFloat(parseFloat(value).toFixed(2));
+              var valueFormatted = numberWithCommas(valueProcessing);
+              buildAmount(valueFormatted, '', '');
+              break;
+  
+            case '3':
+              var valueProcessing = parseFloat(parseFloat(value).toFixed(3));
+              var valueFormatted = numberWithCommas(valueProcessing);
+              buildAmount(valueFormatted, '', '');
+              break;
+  
+            case '8':
+              var valueFormatted = parseFloat(value).toFixed(8);
+              if (parseFloat(value) == 0) {
+                buildAmount('0', '', '');
+              } else {
+                buildAmount(valueFormatted, '', '');
+                var start = numberWithCommas(valueFormatted.slice(0, -5));
+                var middle = valueFormatted.slice(-5, -2);
+                var end = valueFormatted.substr(valueFormatted.length - 2);
+                buildAmount(start, middle, end);
+              }
+              break;
+          }
         }
+
+        formatNumbers($scope.currency, $scope.value);
+        $scope.$watchGroup(['currency', 'value'], function() {
+          formatNumbers($scope.currency, $scope.value);
+        });
       }]
     };
   }
diff --git a/www/views/includes/amount.html b/www/views/includes/amount.html
index 4cf2807ad..361dededc 100644
--- a/www/views/includes/amount.html
+++ b/www/views/includes/amount.html
@@ -1,4 +1,4 @@
 <div class="amount"
-  ng-class="{ 'size-equal': sizeEqual }">
+  ng-class="{ 'size-equal': displaySizeEqual }">
   <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>
 </div>
\ No newline at end of file