diff --git a/lib/main_app.dart b/lib/main_app.dart
index 475ca6a7f..1387bea1e 100644
--- a/lib/main_app.dart
+++ b/lib/main_app.dart
@@ -20,6 +20,7 @@ import 'package:invoiceninja_flutter/ui/app/web_socket_refresh.dart';
 import 'package:invoiceninja_flutter/ui/auth/init_screen.dart';
 import 'package:invoiceninja_flutter/ui/auth/lock_screen.dart';
 import 'package:invoiceninja_flutter/ui/auth/login_vm.dart';
+import 'package:invoiceninja_flutter/ui/client/client_pdf_vm.dart';
 import 'package:invoiceninja_flutter/ui/company_gateway/company_gateway_screen.dart';
 import 'package:invoiceninja_flutter/ui/company_gateway/company_gateway_screen_vm.dart';
 import 'package:invoiceninja_flutter/ui/company_gateway/edit/company_gateway_edit_vm.dart';
@@ -378,6 +379,7 @@ class InvoiceNinjaAppState extends State<InvoiceNinjaApp> {
                         ClientScreen.route: (context) => ClientScreenBuilder(),
                         ClientViewScreen.route: (context) => ClientViewScreen(),
                         ClientEditScreen.route: (context) => ClientEditScreen(),
+                        ClientPdfScreen.route: (context) => ClientPdfScreen(),
                         InvoiceScreen.route: (context) =>
                             InvoiceScreenBuilder(),
                         InvoiceViewScreen.route: (context) =>
diff --git a/lib/ui/app/main_screen.dart b/lib/ui/app/main_screen.dart
index d2bc1d7a2..86e3e7d36 100644
--- a/lib/ui/app/main_screen.dart
+++ b/lib/ui/app/main_screen.dart
@@ -19,6 +19,7 @@ import 'package:invoiceninja_flutter/ui/app/history_drawer_vm.dart';
 import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart';
 import 'package:invoiceninja_flutter/ui/app/menu_drawer_vm.dart';
 import 'package:invoiceninja_flutter/ui/app/screen_imports.dart';
+import 'package:invoiceninja_flutter/ui/client/client_pdf_vm.dart';
 import 'package:invoiceninja_flutter/ui/credit/credit_email_vm.dart';
 import 'package:invoiceninja_flutter/ui/credit/credit_pdf_vm.dart';
 import 'package:invoiceninja_flutter/ui/credit/credit_screen.dart';
@@ -387,7 +388,7 @@ class EntityScreens extends StatelessWidget {
           child = TaskEditScreen();
           break;
         case ClientScreen.route:
-          child = ClientEditScreen();
+          child = isPdf ? ClientPdfScreen() : ClientEditScreen();
           break;
         case VendorScreen.route:
           child = VendorEditScreen();
diff --git a/lib/ui/client/client_pdf_vm.dart b/lib/ui/client/client_pdf_vm.dart
index e8f07cf98..7f86035e8 100644
--- a/lib/ui/client/client_pdf_vm.dart
+++ b/lib/ui/client/client_pdf_vm.dart
@@ -11,7 +11,7 @@ class ClientPdfScreen extends StatelessWidget {
 
   final bool showAppBar;
 
-  static const String route = '/invoice/pdf';
+  static const String route = '/client/pdf';
 
   @override
   Widget build(BuildContext context) {
@@ -21,7 +21,7 @@ class ClientPdfScreen extends StatelessWidget {
       },
       builder: (context, vm) {
         return ClientPdfView(
-          key: ValueKey('__invoice_pdf_${vm.client.id}__'),
+          key: ValueKey('__client_pdf_${vm.client.id}__'),
           viewModel: vm,
           showAppBar: showAppBar,
         );