diff --git a/lib/redux/expense/expense_actions.dart b/lib/redux/expense/expense_actions.dart
index aab020755..7baf451db 100644
--- a/lib/redux/expense/expense_actions.dart
+++ b/lib/redux/expense/expense_actions.dart
@@ -12,6 +12,7 @@ import 'package:http/http.dart';
 
 // Project imports:
 import 'package:invoiceninja_flutter/data/models/models.dart';
+import 'package:invoiceninja_flutter/main_app.dart';
 import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
 import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/redux/document/document_actions.dart';
@@ -308,7 +309,7 @@ void handleExpenseAction(
       if (items.isNotEmpty) {
         if (action == EntityAction.invoiceExpense) {
           createEntity(
-            context: context,
+            context: navigatorKey.currentContext,
             entity: InvoiceEntity(state: state, client: client).rebuild(
               (b) => b
                 ..lineItems.addAll(items)
diff --git a/lib/utils/dialogs.dart b/lib/utils/dialogs.dart
index a346f10e9..ae29f7e04 100644
--- a/lib/utils/dialogs.dart
+++ b/lib/utils/dialogs.dart
@@ -4,6 +4,7 @@ import 'package:flutter/services.dart';
 
 // Package imports:
 import 'package:flutter_redux/flutter_redux.dart';
+import 'package:invoiceninja_flutter/main_app.dart';
 import 'package:invoiceninja_flutter/redux/task/task_actions.dart';
 import 'package:invoiceninja_flutter/redux/task_status/task_status_selectors.dart';
 import 'package:invoiceninja_flutter/utils/formatting.dart';
@@ -547,12 +548,12 @@ void addToInvoiceDialog({
                 ),
               ]),
               onPressed: () {
+                Navigator.of(context).pop();
                 editEntity(
-                    context: context,
+                    context: navigatorKey.currentContext,
                     entity: invoice.rebuild(
                       (b) => b..lineItems.addAll(items),
                     ));
-                Navigator.of(context).pop();
               },
             );
           }).toList(),