diff --git a/src/ng-currency.directive.js b/src/ng-currency.directive.js
index 38c31f5..a20ec70 100644
--- a/src/ng-currency.directive.js
+++ b/src/ng-currency.directive.js
@@ -146,8 +146,8 @@ export default function ngCurrency($filter, $locale, $timeout, ngCurrencySetting
 
       element.bind('focus', () => {
         if (active) {
-          const groupRegex = new RegExp(`\\${$locale.NUMBER_FORMATS.GROUP_SEP}`, 'g');
-          const value = [undefined, null, ''].indexOf(controller.$$rawModelValue) === -1 ? $filter('number')(controller.$$rawModelValue, fraction).replace(groupRegex, '') : controller.$$rawModelValue;
+          const value = clearValue(controller.$viewValue, false);
+
           if (controller.$viewValue !== value) {
             controller.$viewValue = value;
             controller.$render();
@@ -168,7 +168,7 @@ export default function ngCurrency($filter, $locale, $timeout, ngCurrencySetting
         return RegExp('\\-{0,1}((\\' + dChar + ')|([0-9]{1,}\\' + dChar + '?))&?[0-9]{0,' + fraction + '}', 'g');
       }
 
-      function clearValue(value) {
+      function clearValue(value, replaceSeparator = true) {
         value = String(value);
         let dSeparator = $locale.NUMBER_FORMATS.DECIMAL_SEP;
         let cleared = null;
@@ -196,11 +196,13 @@ export default function ngCurrency($filter, $locale, $timeout, ngCurrencySetting
 
         if (decimalRex(dSeparator).test(value)) {
           cleared = value.match(decimalRex(dSeparator))
-            .join('').match(clearRex(dSeparator));
-          cleared = cleared ? cleared[0].replace(dSeparator, '.') : null;
+            .join('').match(clearRex(dSeparator)) || [''];
+
+          cleared = cleared[0];
+          cleared = replaceSeparator ? cleared.replace(dSeparator, '.') : cleared;
         }
 
-        return cleared;
+        return cleared || null;
       }
 
       function getCurrencySymbol() {
diff --git a/test/ng-currency/ng-currency.directive.spec.js b/test/ng-currency/ng-currency.directive.spec.js
index 24176f3..b31e827 100644
--- a/test/ng-currency/ng-currency.directive.spec.js
+++ b/test/ng-currency/ng-currency.directive.spec.js
@@ -165,12 +165,10 @@ describe('ngCurrency directive tests', () => {
           expect(element.val()).toEqual('$123.45');
         });
 
-        it('should update the model correctly', () => {
-          element.val('$123.45');
-          element.triggerHandler('input');
-          element.triggerHandler('blur');
-          expect(scope.value).toEqual(12345);
-          expect(element.val()).toEqual('$123.45');
+        it('should update view value on focus correctly', () => {
+          expect(element.val()).toEqual('$1.00');
+          element.triggerHandler('focus');
+          expect(element.val()).toEqual('1.00');
         });
       });