diff --git a/lib/data/models/task_model.dart b/lib/data/models/task_model.dart
index b9ef837e2..5ca3c7f14 100644
--- a/lib/data/models/task_model.dart
+++ b/lib/data/models/task_model.dart
@@ -771,6 +771,8 @@ abstract class TaskEntity extends Object
         return true;
       } else if (status.id == kTaskStatusLogged && isStopped && !isInvoiced) {
         return true;
+      } else if (status.id == statusId) {
+        return true;
       }
     }
 
diff --git a/lib/ui/task/task_screen.dart b/lib/ui/task/task_screen.dart
index e91b01aff..42e30078f 100644
--- a/lib/ui/task/task_screen.dart
+++ b/lib/ui/task/task_screen.dart
@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 
 // Package imports:
 import 'package:flutter_redux/flutter_redux.dart';
+import 'package:invoiceninja_flutter/redux/task_status/task_status_selectors.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 
 // Project imports:
@@ -51,6 +52,11 @@ class TaskScreen extends StatelessWidget {
         TaskStatusEntity().rebuild((b) => b
           ..id = kTaskStatusInvoiced
           ..name = localization.invoiced),
+      for (var statusId in memoizedSortedActiveTaskStatusIds(
+          state.taskStatusState.list, state.taskStatusState.map))
+        TaskStatusEntity().rebuild((b) => b
+          ..id = statusId
+          ..name = state.taskStatusState.map[statusId].name),
     ];
 
     return ListScaffold(