diff --git a/cypress/e2e/optimization.cy.js b/cypress/e2e/optimization.cy.js
index f177c01aa..8b3edd95f 100644
--- a/cypress/e2e/optimization.cy.js
+++ b/cypress/e2e/optimization.cy.js
@@ -132,7 +132,8 @@ describe('Optimization component', () => {
 
       cy.get('.edit-header-btn').should('not.exist')
 
-      // TODO: test closing by save button
+      cy.get('#map-view').click()
+      cy.get('[data-cy=save]').click()
     })
   })
 })
diff --git a/src/fragments/forms/map-form/components/optimization/components/edit-dialog/EditDialog.vue b/src/fragments/forms/map-form/components/optimization/components/edit-dialog/EditDialog.vue
index f8ee0f0de..f42744c0d 100644
--- a/src/fragments/forms/map-form/components/optimization/components/edit-dialog/EditDialog.vue
+++ b/src/fragments/forms/map-form/components/optimization/components/edit-dialog/EditDialog.vue
@@ -117,7 +117,7 @@
                    @click="closeEditModal">{{$t('global.cancel')}}</v-btn>
           </v-flex>
           <v-flex text-xs-right xs12 sm3 md3 :class="{'ml-2': $vuetify.breakpoint.smAndDown}">
-            <v-btn :block="$lowResolution" color="success" :title="$t('global.save')" @click="saveItems">
+            <v-btn data-cy="save" :block="$lowResolution" color="success" :title="$t('global.save')" @click="saveItems">
               {{$t('global.save')}}
               <v-icon style="margin-left: 5px;">save</v-icon>
             </v-btn>