diff --git a/src/components/tasks/edit-task.vue b/src/components/tasks/edit-task.vue
index 5886ada72..7f624805a 100644
--- a/src/components/tasks/edit-task.vue
+++ b/src/components/tasks/edit-task.vue
@@ -3,17 +3,27 @@
 		<div class="field">
 			<label class="label" for="tasktext">Task Text</label>
 			<div class="control">
-				<input v-focus :class="{ 'disabled': taskService.loading}" :disabled="taskService.loading" class="input"
-					type="text" id="tasktext" placeholder="The task text is here..." v-model="taskEditTask.title" @change="editTaskSubmit()">
+				<input
+						v-focus
+						:class="{ 'disabled': taskService.loading}"
+						:disabled="taskService.loading"
+						class="input"
+						type="text"
+						id="tasktext"
+						placeholder="The task text is here..."
+						v-model="taskEditTask.title"
+						@change="editTaskSubmit()"/>
 			</div>
 		</div>
 		<div class="field">
 			<label class="label" for="taskdescription">Description</label>
 			<div class="control">
-				<textarea :class="{ 'disabled': taskService.loading}" :disabled="taskService.loading" class="textarea"
-					placeholder="The tasks description goes here..." id="taskdescription"
-					v-model="taskEditTask.description" @change="editTaskSubmit()">
-				</textarea>
+				<editor
+						placeholder="The tasks description goes here..."
+						id="taskdescription"
+						v-model="taskEditTask.description"
+						@change="editTaskSubmit()"
+				/>
 			</div>
 		</div>
 
@@ -106,7 +116,10 @@
 
 		<div class="field has-addons">
 			<div class="control is-expanded">
-				<edit-assignees :task-id="taskEditTask.id" :list-id="taskEditTask.listId" :initial-assignees="taskEditTask.assignees"/>
+				<edit-assignees
+						:task-id="taskEditTask.id"
+						:list-id="taskEditTask.listId"
+						:initial-assignees="taskEditTask.assignees"/>
 			</div>
 		</div>
 
@@ -118,10 +131,10 @@
 		</div>
 
 		<related-tasks
-			class="is-narrow"
-			:task-id="task.id"
-			:list-id="task.listId"
-			:initial-related-tasks="task.relatedTasks"
+				class="is-narrow"
+				:task-id="task.id"
+				:list-id="task.listId"
+				:initial-related-tasks="task.relatedTasks"
 		/>
 
 		<button type="submit" class="button is-success is-fullwidth" :class="{ 'is-loading': taskService.loading}">
@@ -181,6 +194,7 @@
 			PercentDoneSelect,
 			PrioritySelect,
 			flatPickr,
+			editor: () => import(/* webpackPrefetch: true */ '../../components/input/editor'),
 		},
 		props: {
 			task: {