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 dc13de094..47577a2ec 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
@@ -13,8 +13,8 @@
                 href="#!"
                 data-bs-toggle="modal"
                 :data-bs-target="getModalId"
-                aria-label="Modal window" 
-                @click-event="focusOnZipInput" />
+                aria-label="Modal window"
+                @click-event="onModalOpen" />
         </div>
     </div>
     <modal
@@ -104,11 +104,12 @@ export default {
             this.$refs.zipCodeInputModal.resetButtonStyle();
         },
 
-        focusOnZipInput() {
-            console.log("focusOnZipInput");
-            var input = document.getElementById("serviceZipCodeInput");
-            input.focus();
-            // this.$refs.zipInputTextQuestion.focus();
+        focusOnZipInput() {},
+
+        onModalOpen() {
+            this.serviceZipCodeInput = this.serviceZip;
+            this.resetsOnZipInput();
+            this.focusOnZipInput();
         },
 
         async setZip() {