diff --git a/static/websiteFunctions/websiteFunctions.js b/static/websiteFunctions/websiteFunctions.js
index 356118ab7..493c88488 100644
--- a/static/websiteFunctions/websiteFunctions.js
+++ b/static/websiteFunctions/websiteFunctions.js
@@ -2823,6 +2823,9 @@ app.controller('manageCronController', function ($scope, $http) {
 
 app.controller('manageAliasController', function ($scope, $http, $timeout, $window) {
 
+    $('form').submit(function (e) {
+        e.preventDefault();
+    });
 
     var masterDomain = "";
 
@@ -2835,6 +2838,14 @@ app.controller('manageAliasController', function ($scope, $http, $timeout, $wind
     $scope.manageAliasLoading = true;
     $scope.operationSuccess = true;
 
+    $scope.createAliasEnter = function ($event) {
+        var keyCode = $event.which || $event.keyCode;
+        if (keyCode === 13) {
+            $scope.manageAliasLoading = false;
+            $scope.addAliasFunc();
+        }
+    };
+
     $scope.showAliasForm = function (domainName) {
 
         $scope.domainAliasForm = false;
diff --git a/websiteFunctions/static/websiteFunctions/websiteFunctions.js b/websiteFunctions/static/websiteFunctions/websiteFunctions.js
index 356118ab7..493c88488 100755
--- a/websiteFunctions/static/websiteFunctions/websiteFunctions.js
+++ b/websiteFunctions/static/websiteFunctions/websiteFunctions.js
@@ -2823,6 +2823,9 @@ app.controller('manageCronController', function ($scope, $http) {
 
 app.controller('manageAliasController', function ($scope, $http, $timeout, $window) {
 
+    $('form').submit(function (e) {
+        e.preventDefault();
+    });
 
     var masterDomain = "";
 
@@ -2835,6 +2838,14 @@ app.controller('manageAliasController', function ($scope, $http, $timeout, $wind
     $scope.manageAliasLoading = true;
     $scope.operationSuccess = true;
 
+    $scope.createAliasEnter = function ($event) {
+        var keyCode = $event.which || $event.keyCode;
+        if (keyCode === 13) {
+            $scope.manageAliasLoading = false;
+            $scope.addAliasFunc();
+        }
+    };
+
     $scope.showAliasForm = function (domainName) {
 
         $scope.domainAliasForm = false;
diff --git a/websiteFunctions/templates/websiteFunctions/domainAlias.html b/websiteFunctions/templates/websiteFunctions/domainAlias.html
index 828726eb9..7c7ff33c4 100755
--- a/websiteFunctions/templates/websiteFunctions/domainAlias.html
+++ b/websiteFunctions/templates/websiteFunctions/domainAlias.html
@@ -78,7 +78,7 @@
                         <div class="form-group">
                             <label class="col-sm-3 control-label">{% trans "Alias Domain" %}</label>
                             <div class="col-sm-6">
-                                <input type="text" class="form-control ng-pristine ng-untouched ng-not-empty ng-valid ng-valid-required" ng-model="aliasDomain" required="">
+                                <input ng-keypress="createAliasEnter($event)" type="text" class="form-control ng-pristine ng-untouched ng-not-empty ng-valid ng-valid-required" ng-model="aliasDomain" required="">
                             </div>
                         </div>