diff --git a/src/views/list/views/List.vue b/src/views/list/views/List.vue
index 817186650..f0f03b26d 100644
--- a/src/views/list/views/List.vue
+++ b/src/views/list/views/List.vue
@@ -158,8 +158,13 @@
 
 <script>
 	import TaskService from '../../../services/task'
-	import EditTask from '../../../components/tasks/edit-task'
 	import TaskModel from '../../../models/task'
+	import LabelTaskService from '../../../services/labelTask'
+	import LabelService from '../../../services/label'
+	import LabelTask from '../../../models/labelTask'
+	import LabelModel from '../../../models/label'
+
+	import EditTask from '../../../components/tasks/edit-task'
 	import SingleTaskInList from '../../../components/tasks/partials/singleTaskInList'
 	import taskList from '../../../components/tasks/mixins/taskList'
 	import {saveListView} from '../../../helpers/saveListView'
@@ -176,6 +181,8 @@
 				newTaskText: '',
 
 				showError: false,
+				labelTaskService: LabelTaskService,
+				labelService: LabelService,
 			}
 		},
 		mixins: [
@@ -188,6 +195,8 @@
 		},
 		created() {
 			this.taskService = new TaskService()
+			this.labelService = new LabelService()
+			this.labelTaskService = new LabelTaskService()
 
 			// Save the current list view to local storage
 			// We use local storage and not vuex here to make it persistent across reloads.
@@ -209,10 +218,107 @@
 
 				let task = new TaskModel({title: this.newTaskText, listId: this.$route.params.listId})
 				this.taskService.create(task)
-					.then(r => {
-						this.tasks.push(r)
+					.then(task => {
+						this.tasks.push(task)
 						this.sortTasks()
 						this.newTaskText = ''
+
+						// Check if the task has words starting with ~ in the title and make them to labels
+						const parts = task.title.split(' ~')
+						// The first element will always contain the title, even if there is no occurrence of ~
+						if (parts.length > 1) {
+
+							// First, create an unresolved promise for each entry in the array to wait
+							// until all labels are added to update the task title once again
+							let labelAddings = []
+							let labelAddsToWaitFor = []
+							parts.forEach((p, index) => {
+								if (index < 1) {
+									return
+								}
+
+								labelAddsToWaitFor.push(new Promise((resolve, reject) => {
+									labelAddings.push({resolve: resolve, reject: reject})
+								}))
+							})
+
+							// Then do everything that is involved in finding, creating and adding the label to the task
+							parts.forEach((p, index) => {
+								if (index < 1) {
+									return
+								}
+
+								// The part up until the next space
+								const labelTitle = p.split(' ')[0]
+
+								// Check if the label exists
+								this.labelService.getAll({}, {s: labelTitle})
+									.then(res => {
+										// Label found, use it
+										if (res.length > 0 && res[0].title === labelTitle) {
+											const labelTask = new LabelTask({
+												taskId: task.id,
+												labelId: res[0].id,
+											})
+											this.labelTaskService.create(labelTask)
+												.then(result => {
+													task.labels.push(res[0])
+
+													// Remove the label text from the task title
+													task.title = task.title.replace(` ~${labelTitle}`, '')
+
+													// Make the promise done (the one with the index 0 does not exist)
+													labelAddings[index-1].resolve(result)
+												})
+												.catch(e => {
+													this.error(e, this)
+												})
+										} else {
+											// label not found, create it
+											const label = new LabelModel({title: labelTitle})
+											this.labelService.create(label)
+												.then(res => {
+													const labelTask = new LabelTask({
+														taskId: task.id,
+														labelId: res.id,
+													})
+													this.labelTaskService.create(labelTask)
+														.then(result => {
+															task.labels.push(res)
+
+															// Remove the label text from the task title
+															task.title = task.title.replace(` ~${labelTitle}`, '')
+
+															// Make the promise done (the one with the index 0 does not exist)
+															labelAddings[index-1].resolve(result)
+														})
+														.catch(e => {
+															this.error(e, this)
+														})
+												})
+												.catch(e => {
+													this.error(e, this)
+												})
+										}
+									})
+									.catch(e => {
+										this.error(e, this)
+									})
+							})
+
+							// This waits to update the task until all labels have been added and the title has
+							// been modified to remove each label text
+							Promise.all(labelAddsToWaitFor)
+								.then(() => {
+									this.taskService.update(task)
+										.then(updatedTask => {
+											this.updateTasks(updatedTask)
+										})
+										.catch(e => {
+											this.error(e, this)
+										})
+								})
+						}
 					})
 					.catch(e => {
 						this.error(e, this)