diff --git a/templates/cid_selector.html b/templates/cid_selector.html
index 37339114..b1949383 100644
--- a/templates/cid_selector.html
+++ b/templates/cid_selector.html
@@ -11,7 +11,7 @@
 <script>
     $(document).ready(function () {
 
-        $("#cid-input").keypress(function(e) {
+        $("#cid-input, #passcode-box").keypress(function(e) {
             // Enter pressed?
             console.log(e)
             if(e.which == 10 || e.which == 13) {