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 9af9876e5..c97b1846d 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
@@ -127,6 +127,7 @@ export default {
 
             if (!zipCodeData.isValid) {
                 this.displayInvalidZipAlert = true;
+                this.focusOnZipInput();
             } else {
                 this.serviceZipModel = {
                     serviceState: zipCodeData.state,
@@ -167,15 +168,10 @@ export default {
             },
         },
     },
-    mounted() {
-        this.$watch(
-            () => {
-                return this.$refs.zipInputTextQuestion.value;
-            },
-            (val) => {
-                this.resetsOnZipInput();
-            }
-        );
+    watch: {
+        serviceZipCodeInput() {
+            this.resetsOnZipInput();
+        },
     },
     components: {
         textLink,