diff --git a/src/fragments/forms/map-form/components/optimization/Optimization.vue b/src/fragments/forms/map-form/components/optimization/Optimization.vue
index 318bdc64c..6cd369567 100644
--- a/src/fragments/forms/map-form/components/optimization/Optimization.vue
+++ b/src/fragments/forms/map-form/components/optimization/Optimization.vue
@@ -27,9 +27,9 @@
         {{ $t('optimization.addFromMap') + $t('optimization.job') }}
       </v-btn>
       <!-- low priority TODO: more elegant solution for this? -->
-      <job-list class="content-list" v-if="mapViewData.hasRoutes()" :jobs="jobs" :jobs-shown="jobsExpanded" :map-view-data="mapViewData"
+      <job-list class="content-list" v-if="mapViewData.hasRoutes()" :jobs="jobs" :job-extended="jobsExpanded" :map-view-data="mapViewData"
                 v-show="jobsExpanded"></job-list>
-      <job-list class="content-list" v-else :jobs="jobs" :jobs-shown="jobsExpanded"></job-list>
+      <job-list class="content-list" v-else :jobs="jobs" :job-extended="jobsExpanded"></job-list>
       <v-card class="content-list" v-if="!jobsExpanded" @click="jobsExpanded=!jobsExpanded">
         <v-card-title>
           <v-icon style="padding: 0 5px 0 7px">work</v-icon>
diff --git a/src/fragments/forms/map-form/components/optimization/components/item-list/JobList.vue b/src/fragments/forms/map-form/components/optimization/components/item-list/JobList.vue
index 3aaa8c36b..bcfa17dcd 100644
--- a/src/fragments/forms/map-form/components/optimization/components/item-list/JobList.vue
+++ b/src/fragments/forms/map-form/components/optimization/components/item-list/JobList.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="job-inputs">
-    <v-expansion-panel  class="no-shadow" :value="jobExtended" :expand="true">
+    <v-expansion-panel  class="no-shadow" :value="showJobs" :expand="true">
       <v-expansion-panel-content style="background: transparent;" v-for="(j, i) in jobs" :key="i">
         <div v-if="localMapViewData === null || !unassignedIds.includes(j.id)" slot="header" style="padding-bottom: 0;"><v-icon style="padding: 0 5px 0 0">work</v-icon><b>Job {{j.id}} - {{ j.location[0].toPrecision(8) }}, {{ j.location[1].toPrecision(8)}}</b></div>
         <div v-else slot="header" style="padding-bottom: 0"><v-icon style="padding: 0 5px 0 0">work</v-icon><b>Job {{j.id}} - {{ j.location[0].toPrecision(8) }}, {{ j.location[1].toPrecision(8)}}
diff --git a/src/fragments/forms/map-form/components/optimization/components/item-list/job-list.js b/src/fragments/forms/map-form/components/optimization/components/item-list/job-list.js
index 236b40e7b..d0dd90d98 100644
--- a/src/fragments/forms/map-form/components/optimization/components/item-list/job-list.js
+++ b/src/fragments/forms/map-form/components/optimization/components/item-list/job-list.js
@@ -4,13 +4,16 @@ import MapViewData from '@/models/map-view-data'
 export default {
   data: () => ({
     localMapViewData: null,
-    jobExtended: [true]
   }),
   props: {
     jobs: {
       Type: Array,
       Required: true
     },
+    jobExtended: {
+      Type: Boolean,
+      Default: true
+    },
     mapViewData: {
       Type: MapViewData,
       Required: false
@@ -24,6 +27,9 @@ export default {
       }
       return unassignedIds
     },
+    showJobs () {
+      return [this.jobExtended]
+    }
   },
   watch: {
     // Every time the response data changes the map builder is reset and the map data is reloaded