diff --git a/src/js/main.js b/src/js/main.js
index 9848815..9f83975 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -255,8 +255,10 @@ $("#passwordModal").on("shown.bs.modal", function () {
     $("#passwordModalInput").focus();
 });
 
-$(".modal.show").on("keydown", function (e) {
+$(".modal").on("keydown", function (e) {
     if (e.keyCode == 13) {
+        // Prevent overlapping modals from all getting clicked
+        e.stopPropagation();
         $(this).find(".btn-default").first().click();
     }
 });