diff --git a/www/common/inner/access.js b/www/common/inner/access.js
index de171f116..b8cab7a6b 100644
--- a/www/common/inner/access.js
+++ b/www/common/inner/access.js
@@ -367,6 +367,13 @@ define([
                 UI.log(Messages.saved);
             });
         });
+        $(addBtn).on('keydown', function () {
+            if (event.keyCode === 13) {
+                event.preventDefault();
+                event.stopPropagation();
+                $(addBtn).click();
+            }
+        });
 
         var called = false;
         redrawAll = function (reload) {
@@ -459,6 +466,8 @@ define([
 
         var setLock = function (locked) {
             $(link).find('.cp-overlay').toggle(locked);
+            $(link).find('.cp-usergrid-user').attr('tabindex', locked ? -1 : 0);
+            $(link).find('.cp-access-add').attr('tabindex', locked ? -1 : 0);
         };
 
         // Remove owner column
@@ -714,6 +723,13 @@ define([
                 UI.log(Messages.saved);
             });
         });
+        $(addBtn).on('keydown', function () {
+            if (event.keyCode === 13) {
+                event.preventDefault();
+                event.stopPropagation();
+                $(addBtn).click();
+            }
+        });
 
         var called = false;
         redrawAll = function (reload) {
@@ -1025,6 +1041,13 @@ define([
                         });
                     });
                 });
+                $(passwordOk).on('keydown', function (e) {
+                    if (e.keyCode === 13) {
+                        e.preventDefault();
+                        e.stopPropagation();
+                        $(passwordOk).click();
+                    }
+                });
                 $d.append(changePass);
             }
             if (owned) {