diff --git a/cypress/integration/task/task.spec.js b/cypress/integration/task/task.spec.js
index ac9481156..d7b60e4c4 100644
--- a/cypress/integration/task/task.spec.js
+++ b/cypress/integration/task/task.spec.js
@@ -169,7 +169,7 @@ describe('Task', () => {
 			cy.get('.task-view .details.content.description .editor .vue-easymde .EasyMDEContainer .CodeMirror-scroll')
 				.type('{selectall}New Description')
 			cy.get('.task-view .details.content.description .editor a')
-				.contains('Done')
+				.contains('save')
 				.click()
 
 			cy.get('.task-view .details.content.description h3 span.is-small.has-text-success')
diff --git a/src/components/input/editor.vue b/src/components/input/editor.vue
index 0208ec121..4786c7844 100644
--- a/src/components/input/editor.vue
+++ b/src/components/input/editor.vue
@@ -96,7 +96,8 @@ export default {
 			default: () => '',
 		},
 		showSave: {
-			default: true,
+			type: Boolean,
+			default: false,
 		},
 	},
 	computed: {
diff --git a/src/components/tasks/partials/comments.vue b/src/components/tasks/partials/comments.vue
index 03d09c85c..e0379c1e4 100644
--- a/src/components/tasks/partials/comments.vue
+++ b/src/components/tasks/partials/comments.vue
@@ -78,6 +78,7 @@
 						"
 						v-model="c.comment"
 						:bottom-actions="actions[c.id]"
+						:show-save="true"
 					/>
 				</div>
 			</div>
@@ -113,7 +114,6 @@
 								:upload-callback="attachmentUpload"
 								:upload-enabled="true"
 								:placeholder="$t('task.comment.placeholder')"
-								:show-save="false"
 								v-if="editorActive"
 								v-model="newComment.comment"
 							/>
diff --git a/src/components/tasks/partials/description.vue b/src/components/tasks/partials/description.vue
index e95907198..fe3ef7b32 100644
--- a/src/components/tasks/partials/description.vue
+++ b/src/components/tasks/partials/description.vue
@@ -23,7 +23,9 @@
 			@change="save"
 			:placeholder="$t('task.description.placeholder')"
 			:empty-text="$t('task.description.empty')"
-			v-model="task.description"/>
+			:show-save="true"
+			v-model="task.description"
+		/>
 	</div>
 </template>