diff --git a/src/layouts/vehicle-style/vehicle-style.spec.js b/src/layouts/vehicle-style/vehicle-style.spec.js
index 3d62e8f15..1f7f24e07 100644
--- a/src/layouts/vehicle-style/vehicle-style.spec.js
+++ b/src/layouts/vehicle-style/vehicle-style.spec.js
@@ -27,6 +27,15 @@ jest.mock("@/store", () => ({
     vehicle: {
       model: "TL",
     },
+    applicationUser:{
+      pageData: {
+        "part-questions": null,
+        "vehicle-make": {},
+        "vehicle-model": {},
+        "vehicle-style": {},
+        "vehicle-damage": {}
+      }
+    }
   },
 }));
 
diff --git a/src/layouts/vehicle-style/vehicle-style.vue b/src/layouts/vehicle-style/vehicle-style.vue
index 4fab2d499..04ba83797 100644
--- a/src/layouts/vehicle-style/vehicle-style.vue
+++ b/src/layouts/vehicle-style/vehicle-style.vue
@@ -38,6 +38,8 @@ import { storeActions } from "@/constants/store-actions";
 import store from "@/store";
 import { storeMutations } from "@/constants/store-mutations";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import router from "@/router";
+import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
 
 export default {
   name: "vehicle-style",
@@ -70,11 +72,10 @@ export default {
     const resultMap = await settleAllPromises(promiseResultMap);
     const visitedVehicleDamage = JSON.stringify(store.getters.applicationUser.pageData).indexOf(fmgPageValues.VEHICLE_DAMAGE) < 0 ? false : true;
 
-
     // Call the "next" function to complete the transition to this page.
 
-    // If we have exactly one style
-    if(resultMap.styleQuestionInitialData.length === 1 || !visitedVehicleDamage) {
+    // If we have exactly one style then navigate directly to vehicle-damage
+    if(resultMap.styleQuestionInitialData.length === 1 && !visitedVehicleDamage) {
       store.commit(storeMutations.UPDATE_STYLE, resultMap.styleQuestionInitialData[0]);
 
       await store.dispatch(storeActions.SET_VEHICLE,
@@ -85,9 +86,8 @@ export default {
           style: store.getters.vehicle.style,
         });
 
-      // ...GetNavigationMap(navigationScenarios.SELECTED_STYLE, to);
-      //... 
-      next({name: 'root', query: Object.assign(to.query, { fmgPage: '....destinationFmgPageValue' })});
+      //emulate selecting the vehicle style
+      router.overrideNavigation(navigationScenarios.SELECTED_STYLE, to, next);
 
     } else{
       next( (vm) => {
diff --git a/src/router/index.js b/src/router/index.js
index 4b9af02e7..d55e9f680 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -155,6 +155,12 @@ router.navigateToExternalUrl = (url, optionalQuery = {}) => {
   navigateToUrl(url, optionalQuery);
 }
 
+//Use this navigation when you need to call next() explicitly. beforeRouteEnter is a good example.
+router.overrideNavigation = (scenario, currentRoute, next, optionalQuery = {}, optionalParams = {}, optionalPageData) => {
+  router.navigate(scenario, currentRoute, optionalQuery, optionalParams, optionalPageData);
+  next();
+}
+
 // PRIVATE FUNCTIONS
 
 // Navigate to the next route, depending on the scenario.