diff --git a/src/components/ManagerPassword.jsx b/src/components/ManagerPassword.jsx
index 5674cfe..6fcb57a 100644
--- a/src/components/ManagerPassword.jsx
+++ b/src/components/ManagerPassword.jsx
@@ -16,6 +16,12 @@ export default function ManagerPassword() {
     socket.emit("manager:createRoom", password)
   }
 
+  const handleKeyDown = (event) => {
+    if (event.key === "Enter") {
+      handleCreate()
+    }
+  }
+
   useEffect(() => {
     socket.on("game:errorMessage", (message) => {
       toast.error(message)
@@ -37,7 +43,9 @@ export default function ManagerPassword() {
 
       <Form>
         <Input
+          type="password"
           onChange={(e) => setPassword(e.target.value)}
+          onKeyDown={handleKeyDown}
           placeholder="Manager password"
         />
         <Button onClick={() => handleCreate()}>Submit</Button>
diff --git a/src/components/game/join/Room.jsx b/src/components/game/join/Room.jsx
index 1d51291..06f2742 100644
--- a/src/components/game/join/Room.jsx
+++ b/src/components/game/join/Room.jsx
@@ -13,6 +13,12 @@ export default function Room() {
     socket.emit("player:checkRoom", roomId)
   }
 
+  const handleKeyDown = (event) => {
+    if (event.key === "Enter") {
+      handleLogin()
+    }
+  }
+
   useEffect(() => {
     socket.on("game:successRoom", (roomId) => {
       dispatch({ type: "JOIN", payload: roomId })
@@ -27,6 +33,7 @@ export default function Room() {
     <Form>
       <Input
         onChange={(e) => setRoomId(e.target.value)}
+        onKeyDown={handleKeyDown}
         placeholder="PIN Code here"
       />
       <Button onClick={() => handleLogin()}>Submit</Button>
diff --git a/src/components/game/join/Username.jsx b/src/components/game/join/Username.jsx
index 325e3dc..d4da0ad 100644
--- a/src/components/game/join/Username.jsx
+++ b/src/components/game/join/Username.jsx
@@ -16,6 +16,12 @@ export default function Username() {
     socket.emit("player:join", { username: username, room: player.room })
   }
 
+  const handleKeyDown = (event) => {
+    if (event.key === "Enter") {
+      handleJoin()
+    }
+  }
+
   useEffect(() => {
     socket.on("game:successJoin", () => {
       dispatch({
@@ -35,6 +41,7 @@ export default function Username() {
     <Form>
       <Input
         onChange={(e) => setUsername(e.target.value)}
+        onKeyDown={handleKeyDown}
         placeholder="Usernname here"
       />
       <Button onClick={() => handleJoin()}>Submit</Button>