diff --git a/src/components/tasks/add-task.vue b/src/components/tasks/add-task.vue
index a1df50fb5..2f3e49b4c 100644
--- a/src/components/tasks/add-task.vue
+++ b/src/components/tasks/add-task.vue
@@ -1,32 +1,34 @@
 <template>
-	<div class="field is-grouped" v-if="validListIdAvailable">
-		<p
-			:class="{ 'is-loading': taskService.loading }"
-			class="control has-icons-left is-expanded"
-		>
-			<input
-				:class="{ disabled: taskService.loading }"
-				@keyup.enter="addTask()"
-				class="input"
-				placeholder="Add a new task..."
-				type="text"
-				v-focus
-				v-model="newTaskText"
-				ref="newTaskInput"
-			/>
-			<span class="icon is-small is-left">
-				<icon icon="tasks" />
-			</span>
-		</p>
-		<p class="control">
-			<x-button
-				:disabled="newTaskText.length === 0"
-				@click="addTask()"
-				icon="plus"
+	<div class="field is-grouped" >
+		<div v-if="validListIdAvailable">
+			<p
+				:class="{ 'is-loading': taskService.loading }"
+				class="control has-icons-left is-expanded"
 			>
-				Add
-			</x-button>
-		</p>
+				<input
+					:class="{ disabled: taskService.loading }"
+					@keyup.enter="addTask()"
+					class="input"
+					placeholder="Add a new task..."
+					type="text"
+					v-focus
+					v-model="newTaskText"
+					ref="newTaskInput"
+				/>
+				<span class="icon is-small is-left">
+					<icon icon="tasks" />
+				</span>
+			</p>
+			<p class="control">
+				<x-button
+					:disabled="newTaskText.length === 0"
+					@click="addTask()"
+					icon="plus"
+				>
+					Add
+				</x-button>
+			</p>
+		</div>
 		<p class="help is-warning" v-if="!validListIdAvailable">
 			No default list set. Please go to settings and specify default list.
 		</p>		
@@ -38,7 +40,6 @@ import LabelTask from '../../models/labelTask'
 import LabelModel from '../../models/label'
 
 import { HAS_TASKS } from '@/store/mutation-types'
-// import Nothing from "@/components/misc/nothing";
 
 import ListService from '../../services/list'
 import TaskService from '../../services/task'
@@ -59,7 +60,6 @@ export default {
 			validListIdAvailable: false,
 		}
 	},
-	components: {},
 	props: {
 		listId: {
 			type: Number,
diff --git a/src/components/tasks/partials/listSearch.vue b/src/components/tasks/partials/listSearch.vue
index 3c2bf336f..7def18767 100644
--- a/src/components/tasks/partials/listSearch.vue
+++ b/src/components/tasks/partials/listSearch.vue
@@ -88,6 +88,9 @@ export default {
 			}
 			return 'Shared Lists'
 		},
+		handleInput (e) {
+		this.$emit('input', this.content)
+		},		
 	},
 }
 </script>
diff --git a/src/models/userSettings.js b/src/models/userSettings.js
index cb72fd3ec..6ed0ffe58 100644
--- a/src/models/userSettings.js
+++ b/src/models/userSettings.js
@@ -9,7 +9,7 @@ export default class UserSettingsModel extends AbstractModel {
 			discoverableByName: false,
 			discoverableByEmail: false,
 			overdueTasksRemindersEnabled: true,
-			defaultListId: 1,
+			defaultListId: undefined,
 			weekStart: 0,
 		}
 	}
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 7d98dfe0d..dc967003d 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -49,13 +49,9 @@ export default {
 			loading: false,
 			currentDate: new Date(),
 			tasks: [],
-			defaultListId: undefined,
 			showTasksKey: 0,
 		}
 	},
-	created() {
-		//TODO: Load the value from user settings. Until then it will not render the add task component.
-	},
 	computed: mapState({
 		migratorsEnabled: state =>
 			state.config.availableMigrators !== null &&
@@ -63,6 +59,7 @@ export default {
 		authenticated: state => state.auth.authenticated,
 		userInfo: state => state.auth.info,
 		hasTasks: state => state.hasTasks,
+		defaultListId: state => state.auth.defaultListId,
 		defaultNamespaceId: state => {
 			if (state.namespaces.namespaces.length === 0) {
 				return 0