diff --git a/lib/ui/invoice/edit/invoice_edit.dart b/lib/ui/invoice/edit/invoice_edit.dart
index e05c19a97..81ef7bdf3 100644
--- a/lib/ui/invoice/edit/invoice_edit.dart
+++ b/lib/ui/invoice/edit/invoice_edit.dart
@@ -124,7 +124,7 @@ class _InvoiceEditState extends State<InvoiceEdit>
                 ),
         ),
         body: state.prefState.isDesktop
-            ? InvoiceEditDesktop()
+            ? InvoiceEditDetailsScreen()
             : Form(
                 key: widget.formKey,
                 child: TabBarView(
diff --git a/lib/ui/invoice/edit/invoice_edit_desktop.dart b/lib/ui/invoice/edit/invoice_edit_desktop.dart
index 0ceb0133d..834c7a453 100644
--- a/lib/ui/invoice/edit/invoice_edit_desktop.dart
+++ b/lib/ui/invoice/edit/invoice_edit_desktop.dart
@@ -1,8 +1,23 @@
 import 'package:flutter/widgets.dart';
+import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_details_vm.dart';
 
-class InvoiceEditDesktop extends StatelessWidget {
+class InvoiceEditDesktop extends StatefulWidget {
+  const InvoiceEditDesktop({
+    Key key,
+    @required this.viewModel,
+    this.isQuote = false,
+  }) : super(key: key);
+
+  final EntityEditDetailsVM viewModel;
+  final bool isQuote;
+
+  @override
+  InvoiceEditDesktopState createState() => InvoiceEditDesktopState();
+}
+
+class InvoiceEditDesktopState extends State<InvoiceEditDesktop> {
   @override
   Widget build(BuildContext context) {
-    return Container();
+    return Text('test');
   }
 }
diff --git a/lib/ui/invoice/edit/invoice_edit_details_vm.dart b/lib/ui/invoice/edit/invoice_edit_details_vm.dart
index e8f2e64ec..47f0112eb 100644
--- a/lib/ui/invoice/edit/invoice_edit_details_vm.dart
+++ b/lib/ui/invoice/edit/invoice_edit_details_vm.dart
@@ -7,6 +7,7 @@ import 'package:flutter_redux/flutter_redux.dart';
 import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
 import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart';
 import 'package:invoiceninja_flutter/ui/app/screen_imports.dart';
+import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_desktop.dart';
 import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_details.dart';
 import 'package:redux/redux.dart';
 import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart';
@@ -23,9 +24,15 @@ class InvoiceEditDetailsScreen extends StatelessWidget {
         return InvoiceEditDetailsVM.fromStore(store);
       },
       builder: (context, viewModel) {
-        return InvoiceEditDetails(
-          viewModel: viewModel,
-        );
+        if (viewModel.state.prefState.isDesktop) {
+          return InvoiceEditDesktop(
+            viewModel: viewModel,
+          );
+        } else {
+          return InvoiceEditDetails(
+            viewModel: viewModel,
+          );
+        }
       },
     );
   }
@@ -33,6 +40,7 @@ class InvoiceEditDetailsScreen extends StatelessWidget {
 
 class EntityEditDetailsVM {
   EntityEditDetailsVM({
+    @required this.state,
     @required this.company,
     @required this.invoice,
     @required this.onChanged,
@@ -42,6 +50,7 @@ class EntityEditDetailsVM {
     @required this.onAddClientPressed,
   });
 
+  final AppState state;
   final CompanyEntity company;
   final InvoiceEntity invoice;
   final Function(InvoiceEntity) onChanged;
@@ -54,6 +63,7 @@ class EntityEditDetailsVM {
 
 class InvoiceEditDetailsVM extends EntityEditDetailsVM {
   InvoiceEditDetailsVM({
+    AppState state,
     CompanyEntity company,
     InvoiceEntity invoice,
     Function(InvoiceEntity) onChanged,
@@ -63,6 +73,7 @@ class InvoiceEditDetailsVM extends EntityEditDetailsVM {
     Function(BuildContext context, Completer<SelectableEntity> completer)
         onAddClientPressed,
   }) : super(
+          state: state,
           company: company,
           invoice: invoice,
           onChanged: onChanged,
@@ -77,6 +88,7 @@ class InvoiceEditDetailsVM extends EntityEditDetailsVM {
     final invoice = state.invoiceUIState.editing;
 
     return InvoiceEditDetailsVM(
+      state: state,
       company: state.company,
       invoice: invoice,
       onChanged: (InvoiceEntity invoice) =>
diff --git a/lib/ui/quote/edit/quote_edit_details_vm.dart b/lib/ui/quote/edit/quote_edit_details_vm.dart
index cbb06036b..649cd3fd0 100644
--- a/lib/ui/quote/edit/quote_edit_details_vm.dart
+++ b/lib/ui/quote/edit/quote_edit_details_vm.dart
@@ -35,6 +35,7 @@ class QuoteEditDetailsScreen extends StatelessWidget {
 
 class QuoteEditDetailsVM extends EntityEditDetailsVM {
   QuoteEditDetailsVM({
+    AppState state,
     CompanyEntity company,
     InvoiceEntity invoice,
     Function(InvoiceEntity) onChanged,
@@ -44,6 +45,7 @@ class QuoteEditDetailsVM extends EntityEditDetailsVM {
     Function(BuildContext context, Completer<SelectableEntity> completer)
         onAddClientPressed,
   }) : super(
+          state: state,
           company: company,
           invoice: invoice,
           onChanged: onChanged,