diff --git a/package.json b/package.json
index 42129d578..d32fce9dd 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "@atlaskit/button": "1.0.3",
     "@atlaskit/button-group": "1.0.0",
     "@atlaskit/dropdown-menu": "1.4.0",
-    "@atlaskit/field-text": "2.0.3",
+    "@atlaskit/field-text": "2.7.0",
     "@atlaskit/icon": "6.0.0",
     "@atlaskit/modal-dialog": "1.2.4",
     "@atlaskit/tabs": "1.2.5",
diff --git a/react/features/room-lock/components/PasswordRequiredPrompt.web.js b/react/features/room-lock/components/PasswordRequiredPrompt.web.js
index 42fbc0f05..6933fae2e 100644
--- a/react/features/room-lock/components/PasswordRequiredPrompt.web.js
+++ b/react/features/room-lock/components/PasswordRequiredPrompt.web.js
@@ -75,6 +75,7 @@ class PasswordRequiredPrompt extends Component {
         return (
             <div>
                 <AKFieldText
+                    autoFocus = { true }
                     compact = { true }
                     label = { this.props.t('dialog.passwordLabel') }
                     name = 'lockKey'