diff --git a/app/javascript/vue/ove/OpenVectorEditor.vue b/app/javascript/vue/ove/OpenVectorEditor.vue
index 4eb9e47e6..dc7cd257a 100644
--- a/app/javascript/vue/ove/OpenVectorEditor.vue
+++ b/app/javascript/vue/ove/OpenVectorEditor.vue
@@ -55,6 +55,7 @@
         generatePng: true,
         readOnly: this.readOnly,
         showMenuBar: true,
+        alwaysAllowSave: true,
         ToolBarProps: {
           toolList: [
             'saveTool',
@@ -108,12 +109,11 @@
         );
       },
       saveAndClose() {
-        this.closeAfterSave = close;
-        document.querySelector('[data-test=saveTool]').click();
+        this.closeAfterSave = true;
+        document.querySelector('[data-test=saveTool]').click()
       },
       saveFile(opts, sequenceDataToSave, editorState, onSuccessCallback) {
         if (this.readOnly) return;
-
         blobToBase64(opts.pngFile).then((base64image) => {
           (this.fileUrl ? axios.patch : axios.post)(
             this.updateUrl,
diff --git a/app/javascript/vue/protocol/attachments.vue b/app/javascript/vue/protocol/attachments.vue
index c2e5da344..9ac6afba3 100644
--- a/app/javascript/vue/protocol/attachments.vue
+++ b/app/javascript/vue/protocol/attachments.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="step-attachments">
+  <div class="step-attachments"  v-if="attachments && attachments.length">
     <div class="attachments-actions">
       <div class="title">
         <h3>{{ i18n.t('protocols.steps.files', {count: attachments.length}) }}</h3>
diff --git a/app/javascript/vue/protocol/step.vue b/app/javascript/vue/protocol/step.vue
index 8ecbe590f..92cbd079f 100644
--- a/app/javascript/vue/protocol/step.vue
+++ b/app/javascript/vue/protocol/step.vue
@@ -140,8 +140,8 @@
     <div class="collapse in" :id="'stepBody' + step.id">
       <div class="step-elements">
         <div class="step-timestamp">{{ i18n.t('protocols.steps.timestamp', {date: step.attributes.created_at, user: step.attributes.created_by}) }}</div>
-        <template v-for="(element, index) in orderedElements">
           <component
+            v-for="(element, index) in orderedElements"
             :is="elements[index].attributes.orderable_type"
             :key="index"
             :element.sync="elements[index]"
@@ -154,17 +154,16 @@
             @reorder="openReorderModal"
             @component:insert="insertElement"
           />
-        </template>
-        <Attachments v-if="attachments.length"
-                    :step="step"
-                    :attachments="attachments"
-                    :attachmentsReady="attachmentsReady"
-                    @attachments:openFileModal="showFileModal = true"
-                    @attachment:deleted="attachmentDeleted"
-                    @attachment:uploaded="loadAttachments"
-                    @attachments:order="changeAttachmentsOrder"
-                    @attachments:viewMode="changeAttachmentsViewMode"
-                    @attachment:viewMode="updateAttachmentViewMode"/>
+        <Attachments
+          :step="step"
+          :attachments="attachments"
+          :attachmentsReady="attachmentsReady"
+          @attachments:openFileModal="showFileModal = true"
+          @attachment:deleted="attachmentDeleted"
+          @attachment:uploaded="loadAttachments"
+          @attachments:order="changeAttachmentsOrder"
+          @attachments:viewMode="changeAttachmentsViewMode"
+          @attachment:viewMode="updateAttachmentViewMode"/>
       </div>
     </div>
     <deleteStepModal v-if="confirmingDelete" @confirm="deleteStep" @cancel="closeDeleteModal"/>
@@ -308,7 +307,6 @@
 
         $.get(this.urls.attachments_url, (result) => {
           this.attachments = result.data
-
           if (this.attachments.findIndex((e) => e.attributes.attached === false) >= 0) {
             setTimeout(() => {
               this.loadAttachments()