diff --git a/src/components/input/editor/TipTap.vue b/src/components/input/editor/TipTap.vue
index 34d1f37c67..f5535bc029 100644
--- a/src/components/input/editor/TipTap.vue
+++ b/src/components/input/editor/TipTap.vue
@@ -64,6 +64,7 @@
 			class="tiptap__editor"
 			:class="{'tiptap__editor-is-edit-enabled': isEditing}"
 			:editor="editor"
+			@click="focusIfEditing()"
 		/>
 
 		<input
@@ -581,6 +582,12 @@ function setFocusToEditor(event) {
 	editor.value?.commands.focus()
 }
 
+function focusIfEditing() {
+	if (isEditing.value) {
+		editor.value?.commands.focus()
+	}
+}
+
 function clickTasklistCheckbox(event) {
 	event.stopImmediatePropagation()