diff --git a/modules/core/client/directives/auto-focus.client.directive.js b/modules/core/client/directives/auto-focus.client.directive.js
index 3720e514..1112e46f 100644
--- a/modules/core/client/directives/auto-focus.client.directive.js
+++ b/modules/core/client/directives/auto-focus.client.directive.js
@@ -22,7 +22,7 @@
         $timeout(function () {
           var el = element[0];
           el.focus();
-          if (attrs.type !== 'number') {
+          if (attrs.type !== 'number' && attrs.type !== 'email') {
             el.selectionStart = el.selectionEnd = el.value.length;
           }
         }, 100);