diff --git a/lib/redux/ui/ui_state.dart b/lib/redux/ui/ui_state.dart
index 7c6667d95..08a3f90d8 100644
--- a/lib/redux/ui/ui_state.dart
+++ b/lib/redux/ui/ui_state.dart
@@ -250,6 +250,8 @@ abstract class UIState implements Built<UIState, UIStateBuilder> {
 
   bool get isPreviewing => previewStack.isNotEmpty;
 
+  bool get isList => !isEditing && !isEmailing && !isPDF && !isInSettings;
+
   bool get hasRecentActivity {
     if (lastActivityAt == 0) {
       return false;
diff --git a/lib/ui/app/main_screen.dart b/lib/ui/app/main_screen.dart
index 0f491c2b4..eadc19ffd 100644
--- a/lib/ui/app/main_screen.dart
+++ b/lib/ui/app/main_screen.dart
@@ -713,7 +713,7 @@ class EntityScreens extends StatelessWidget {
             child: AppBorder(
               child: AppBorder(
                 child: child,
-                isTop: isFullScreen && uiState.filterEntityType != null,
+                isTop: isFullScreen,
               ),
               isLeft: true,
             ),
diff --git a/lib/ui/app/menu_drawer.dart b/lib/ui/app/menu_drawer.dart
index ac9b59568..234a85b40 100644
--- a/lib/ui/app/menu_drawer.dart
+++ b/lib/ui/app/menu_drawer.dart
@@ -618,7 +618,8 @@ class _DrawerTileState extends State<DrawerTile> {
     }
 
     final isSelected = uiState.filterEntityType != null &&
-            prefState.isViewerFullScreen(uiState.filterEntityType)
+            prefState.isViewerFullScreen(uiState.filterEntityType) &&
+            uiState.isList
         ? widget.entityType == uiState.filterEntityType
         : uiState.currentRoute.startsWith('/${toSnakeCase(route)}');
 
diff --git a/lib/ui/invoice/edit/invoice_edit_desktop.dart b/lib/ui/invoice/edit/invoice_edit_desktop.dart
index 66983e208..5cdad52af 100644
--- a/lib/ui/invoice/edit/invoice_edit_desktop.dart
+++ b/lib/ui/invoice/edit/invoice_edit_desktop.dart
@@ -267,23 +267,18 @@ class InvoiceEditDesktopState extends State<InvoiceEditDesktop>
                             viewModel.onAddClientPressed(context, completer),
                       )
                     else
-                      InkWell(
-                        onTap: () {
-                          filterByEntity(context: context, entity: client);
-                        },
-                        child: ConstrainedBox(
-                          constraints: BoxConstraints(
-                              minWidth: double.infinity, minHeight: 40),
-                          child: Padding(
-                            padding: const EdgeInsets.all(6),
-                            child: Text(
-                              EntityPresenter()
-                                  .initialize(client, context)
-                                  .title(),
-                              style: Theme.of(context).textTheme.headline6,
-                              maxLines: 2,
-                              overflow: TextOverflow.ellipsis,
-                            ),
+                      ConstrainedBox(
+                        constraints: BoxConstraints(
+                            minWidth: double.infinity, minHeight: 40),
+                        child: Padding(
+                          padding: const EdgeInsets.all(6),
+                          child: Text(
+                            EntityPresenter()
+                                .initialize(client, context)
+                                .title(),
+                            style: Theme.of(context).textTheme.headline6,
+                            maxLines: 2,
+                            overflow: TextOverflow.ellipsis,
                           ),
                         ),
                       ),