diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 764ca2da9..8be321660 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -29,6 +29,7 @@
                     <modalButtonMain
                         isPrimary
                         class="w-100"
+                        id="modalbtn"
                         ref="modalButtonMain"
                         loaderColor="white"
                         :buttonText="footerButtonText"
diff --git a/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue b/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue
index 7c3a95151..e6ea27737 100644
--- a/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue
+++ b/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue
@@ -11,6 +11,7 @@
             :headerText="modalHeaderText"
             :onModalClosedCallback="onModalClosed"
             :onModalOpenedCallback="focusOnPromoInput"
+            @keypress.enter="onEnter"
             :footerButtonText="modalFooterText"
             @footer-button-event="addPromoCode">
             <promoQuestion
@@ -162,6 +163,10 @@ export default {
         openModal() {
             this.modal.openModal();
         },
+        onEnter(e) {
+            e.preventDefault();
+            this.modal.validateAndEmit();
+        },
         closeModal() {
             this.modal.closeModal();
         },
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 841dfe153..820b3eb71 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -19,6 +19,7 @@
         :onModalOpenedCallback="onModalOpened"
         :onModalClosedCallback="onModalClosed"
         :footerButtonText="modalFooterText"
+        @keypress.enter="onEnter"
         @footer-button-event="setZipCode">
         <serviceZipQuestion
             ref="serviceZipQuestion"
@@ -108,6 +109,10 @@ export default {
             const input = document.getElementById(this.serviceZipCodeTextInputId);
             input?.focus();
         },
+        focusOnModalButton() {
+            const modalButton = document.getElementById("modalbtn");
+            modalButton?.focus();
+        },
         copyModel(modelToCopy) {
             return {
                 state: modelToCopy.state,
@@ -117,6 +122,12 @@ export default {
         openModal() {
             this.modal.openModal();
         },
+        onEnter(e) {
+            e.preventDefault();
+            this.focusOnModalButton();
+            this.modal.validateAndEmit();
+            this.focusOnZipInput();
+        },
         closeModal() {
             this.modal.closeModal();
         },