diff --git a/lib/redux/project/project_actions.dart b/lib/redux/project/project_actions.dart
index a53b831cb..8d572f1ea 100644
--- a/lib/redux/project/project_actions.dart
+++ b/lib/redux/project/project_actions.dart
@@ -7,6 +7,7 @@ import 'package:flutter_redux/flutter_redux.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
 import 'package:invoiceninja_flutter/redux/app/app_state.dart';
+import 'package:invoiceninja_flutter/redux/project/project_selectors.dart';
 import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart';
 import 'package:invoiceninja_flutter/utils/completers.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
@@ -279,11 +280,6 @@ void handleProjectAction(
             ..clientId = project.clientId));
       break;
     case EntityAction.newInvoice:
-      createEntity(
-          context: context,
-          entity: InvoiceEntity(state: state, client: client)
-              .rebuild((b) => b..clientId = project.clientId));
-      /*
       final items =
           convertProjectToInvoiceItem(project: project, context: context);
       createEntity(
@@ -291,8 +287,7 @@ void handleProjectAction(
           entity: InvoiceEntity(state: state).rebuild((b) => b
             ..hasTasks = true
             ..clientId = project.clientId
-            ..lineItems.addAll(items)));            
-       */
+            ..lineItems.addAll(items)));
       break;
     case EntityAction.newExpense:
       createEntity(
diff --git a/lib/ui/project/view/project_view.dart b/lib/ui/project/view/project_view.dart
index facd75938..c78cb0475 100644
--- a/lib/ui/project/view/project_view.dart
+++ b/lib/ui/project/view/project_view.dart
@@ -41,6 +41,7 @@ class _ProjectViewState extends State<ProjectView>
   @override
   Widget build(BuildContext context) {
     final viewModel = widget.viewModel;
+    final state = viewModel.state;
     final project = viewModel.project;
     final localization = AppLocalization.of(context);
     final documents = project.documents;
@@ -89,7 +90,9 @@ class _ProjectViewState extends State<ProjectView>
             BottomButtons(
               entity: project,
               action1: EntityAction.newTask,
-              action2: EntityAction.archive,
+              action2: state.company.isModuleEnabled(EntityType.expense)
+                  ? EntityAction.newExpense
+                  : EntityAction.newInvoice,
             ),
           ],
         );