diff --git a/lib/api/labels.dart b/lib/api/labels.dart
index 9e0feee..979f1f6 100644
--- a/lib/api/labels.dart
+++ b/lib/api/labels.dart
@@ -9,7 +9,7 @@ class LabelAPIService extends APIService implements LabelService {
   @override
   Future<Label> create(Label label) {
     return client
-        .put('/labels', body: label)
+        .put('/labels', body: label.toJSON())
         .then((result) => Label.fromJson(result));
   }
 
diff --git a/lib/models/label.dart b/lib/models/label.dart
index 8fd44cd..8e2d23a 100644
--- a/lib/models/label.dart
+++ b/lib/models/label.dart
@@ -11,7 +11,7 @@ class Label {
   final Color color;
 
   Label(
-      {@required this.id,
+      {this.id,
       this.title,
       this.description,
       this.color,
diff --git a/lib/pages/list/task_edit.dart b/lib/pages/list/task_edit.dart
index 554d033..e2c3fbb 100644
--- a/lib/pages/list/task_edit.dart
+++ b/lib/pages/list/task_edit.dart
@@ -32,7 +32,6 @@ class _TaskEditPageState extends State<TaskEditPage> {
       _suggestedLabels; // we use this to find the label object after a user taps on the suggestion, because the typeahead only uses strings, not full objects.
   var _reminderInputs = new List<Widget>();
   final _labelTypeAheadController = TextEditingController();
-  String _labelSearchText;
 
   @override
   Widget build(BuildContext ctx) {
@@ -247,7 +246,6 @@ class _TaskEditPageState extends State<TaskEditPage> {
                         child: TypeAheadFormField(
                           textFieldConfiguration: TextFieldConfiguration(
                               controller: _labelTypeAheadController,
-                              onChanged: (value) => _labelSearchText = value,
                               decoration: InputDecoration(
                                   labelText: 'Add a new label')),
                           suggestionsCallback: (pattern) {
@@ -268,9 +266,7 @@ class _TaskEditPageState extends State<TaskEditPage> {
                         ),
                       ),
                       IconButton(
-                        onPressed: () {
-                          print(_labelSearchText);
-                        },
+                        onPressed: () => _createAndAddLabel(_labelTypeAheadController.text),
                         icon: Icon(Icons.add),
                       )
                     ],
@@ -377,6 +373,18 @@ class _TaskEditPageState extends State<TaskEditPage> {
     }
   }
 
+  _createAndAddLabel(String labelTitle) {
+    Label newLabel = Label(title: labelTitle);
+    VikunjaGlobal.of(context)
+        .labelService.create(newLabel)
+    .then((createdLabel) {
+      setState(() {
+        _labels.add(createdLabel);
+        _labelTypeAheadController.clear();
+      });
+    });
+  }
+
   // FIXME: Move the following two functions to an extra class or type.
   _priorityFromString(String priority) {
     switch (priority) {