diff --git a/index.html b/index.html
index 5d191d9..23ada4e 100644
--- a/index.html
+++ b/index.html
@@ -726,7 +726,7 @@
             <div class="modal-body">
                 <div class="form-group">
                     <label class="form-label" for="pinInput">4-Digit PIN</label>
-                    <input type="password" class="form-input pin-input" id="pinInput" maxlength="4" placeholder="••••" inputmode="numeric" aria-describedby="pinHelpText">
+                    <input type="password" class="form-input pin-input" id="pinInput" maxlength="4" placeholder="••••" inputmode="numeric" aria-describedby="pinHelpText" onkeydown="if(event.key==='Enter'){event.preventDefault();verifyPin();}">
                 </div>
                 <button class="btn btn-primary" onclick="verifyPin()">Unlock</button>
                 <p id="pinHelpText" style="text-align: center; margin-top: 16px; font-size: 0.85rem; color: var(--soft-gray);"></p>
@@ -756,7 +756,7 @@
                 </div>
                 <div class="form-group">
                     <label class="form-label" for="confirmPinInput">Confirm PIN</label>
-                    <input type="password" class="form-input pin-input" id="confirmPinInput" maxlength="4" placeholder="••••" inputmode="numeric">
+                    <input type="password" class="form-input pin-input" id="confirmPinInput" maxlength="4" placeholder="••••" inputmode="numeric" onkeydown="if(event.key==='Enter'){event.preventDefault();setPin();}">
                 </div>
                 <button class="btn btn-primary" onclick="setPin()">Save PIN</button>
             </div>
@@ -778,7 +778,7 @@
             <div class="modal-body">
                 <div class="form-group">
                     <label class="form-label" for="itemName">Item Name</label>
-                    <input type="text" class="form-input" id="itemName" placeholder="e.g., All Purpose Flour">
+                    <input type="text" class="form-input" id="itemName" placeholder="e.g., All Purpose Flour" onkeydown="if(event.key==='Enter'){event.preventDefault();saveItem();}">
                 </div>
                 <div class="form-group">
                     <label class="form-label" for="itemContainer">Container Type</label>