diff --git a/lib/ui/client/client_list_item.dart b/lib/ui/client/client_list_item.dart
index d073cae2d..59475e8e1 100644
--- a/lib/ui/client/client_list_item.dart
+++ b/lib/ui/client/client_list_item.dart
@@ -9,6 +9,7 @@ import 'package:invoiceninja_flutter/ui/app/actions_menu_button.dart';
 import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart';
 import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart';
 import 'package:invoiceninja_flutter/utils/formatting.dart';
+import 'package:invoiceninja_flutter/utils/platforms.dart';
 
 class ClientListItem extends StatelessWidget {
   const ClientListItem({
@@ -48,7 +49,7 @@ class ClientListItem extends StatelessWidget {
     final textStyle = TextStyle(fontSize: 16);
 
     return DismissibleEntity(
-      isSelected: client.id ==
+      isSelected: isDesktop(context) && client.id ==
           (uiState.isEditing
               ? clientUIState.editing.id
               : clientUIState.selectedId),
diff --git a/lib/ui/expense/expense_list_item.dart b/lib/ui/expense/expense_list_item.dart
index 91ad465d3..6b65754e4 100644
--- a/lib/ui/expense/expense_list_item.dart
+++ b/lib/ui/expense/expense_list_item.dart
@@ -9,6 +9,7 @@ import 'package:flutter/material.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
+import 'package:invoiceninja_flutter/utils/platforms.dart';
 
 class ExpenseListItem extends StatelessWidget {
   const ExpenseListItem({
@@ -82,7 +83,7 @@ class ExpenseListItem extends StatelessWidget {
     final showCheckbox = onCheckboxChanged != null || isInMultiselect;
 
     return DismissibleEntity(
-      isSelected: expense.id ==
+      isSelected: isDesktop(context) && expense.id ==
           (uiState.isEditing
               ? expenseUIState.editing.id
               : expenseUIState.selectedId),
diff --git a/lib/ui/invoice/invoice_list_item.dart b/lib/ui/invoice/invoice_list_item.dart
index 71c4a7938..3cb7fb4b9 100644
--- a/lib/ui/invoice/invoice_list_item.dart
+++ b/lib/ui/invoice/invoice_list_item.dart
@@ -11,6 +11,7 @@ import 'package:flutter/material.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
+import 'package:invoiceninja_flutter/utils/platforms.dart';
 
 class InvoiceListItem extends StatelessWidget {
   const InvoiceListItem({
@@ -68,10 +69,11 @@ class InvoiceListItem extends StatelessWidget {
     }
 
     return DismissibleEntity(
-        isSelected: invoice.id ==
-            (uiState.isEditing
-                ? invoiceUIState.editing.id
-                : invoiceUIState.selectedId),
+        isSelected: isDesktop(context) &&
+            invoice.id ==
+                (uiState.isEditing
+                    ? invoiceUIState.editing.id
+                    : invoiceUIState.selectedId),
         userCompany: state.userCompany,
         entity: invoice,
         onEntityAction: onEntityAction,
diff --git a/lib/ui/payment/payment_list_item.dart b/lib/ui/payment/payment_list_item.dart
index 31428f768..100c3a481 100644
--- a/lib/ui/payment/payment_list_item.dart
+++ b/lib/ui/payment/payment_list_item.dart
@@ -11,6 +11,7 @@ import 'package:flutter/material.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
+import 'package:invoiceninja_flutter/utils/platforms.dart';
 
 class PaymentListItem extends StatelessWidget {
   const PaymentListItem({
@@ -65,7 +66,7 @@ class PaymentListItem extends StatelessWidget {
     }
 
     return DismissibleEntity(
-      isSelected: payment.id ==
+      isSelected: isDesktop(context) && payment.id ==
           (uiState.isEditing
               ? paymentUIState.editing.id
               : paymentUIState.selectedId),
diff --git a/lib/ui/product/product_list_item.dart b/lib/ui/product/product_list_item.dart
index 792dfede0..02d225ee1 100644
--- a/lib/ui/product/product_list_item.dart
+++ b/lib/ui/product/product_list_item.dart
@@ -9,6 +9,7 @@ import 'package:invoiceninja_flutter/ui/app/actions_menu_button.dart';
 import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart';
 import 'package:invoiceninja_flutter/ui/app/entity_state_label.dart';
 import 'package:invoiceninja_flutter/utils/formatting.dart';
+import 'package:invoiceninja_flutter/utils/platforms.dart';
 
 class ProductListItem extends StatelessWidget {
   const ProductListItem({
@@ -51,7 +52,7 @@ class ProductListItem extends StatelessWidget {
     final textStyle = TextStyle(fontSize: 16);
 
     return DismissibleEntity(
-      isSelected: product.id ==
+      isSelected: isDesktop(context) && product.id ==
           (uiState.isEditing
               ? productUIState.editing.id
               : productUIState.selectedId),
diff --git a/lib/ui/project/project_list_item.dart b/lib/ui/project/project_list_item.dart
index de062a67b..31e78e2de 100644
--- a/lib/ui/project/project_list_item.dart
+++ b/lib/ui/project/project_list_item.dart
@@ -7,6 +7,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart';
+import 'package:invoiceninja_flutter/utils/platforms.dart';
 
 class ProjectListItem extends StatelessWidget {
   const ProjectListItem({
@@ -49,7 +50,7 @@ class ProjectListItem extends StatelessWidget {
     final subtitle = filterMatch ?? client.displayName;
 
     return DismissibleEntity(
-      isSelected: project.id ==
+      isSelected: isDesktop(context) && project.id ==
           (uiState.isEditing
               ? projectUIState.editing.id
               : projectUIState.selectedId),
diff --git a/lib/ui/task/task_list_item.dart b/lib/ui/task/task_list_item.dart
index 56d758e55..4509f3273 100644
--- a/lib/ui/task/task_list_item.dart
+++ b/lib/ui/task/task_list_item.dart
@@ -9,6 +9,7 @@ import 'package:flutter/material.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
+import 'package:invoiceninja_flutter/utils/platforms.dart';
 
 class TaskListItem extends StatelessWidget {
   const TaskListItem({
@@ -66,7 +67,7 @@ class TaskListItem extends StatelessWidget {
     }
 
     return DismissibleEntity(
-      isSelected: task.id ==
+      isSelected: isDesktop(context) && task.id ==
           (uiState.isEditing ? taskUIState.editing.id : taskUIState.selectedId),
       userCompany: userCompany,
       entity: task,
diff --git a/lib/ui/vendor/vendor_list_item.dart b/lib/ui/vendor/vendor_list_item.dart
index 087f224f4..9e9d3d3bd 100644
--- a/lib/ui/vendor/vendor_list_item.dart
+++ b/lib/ui/vendor/vendor_list_item.dart
@@ -7,6 +7,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart';
+import 'package:invoiceninja_flutter/utils/platforms.dart';
 
 class VendorListItem extends StatelessWidget {
   const VendorListItem({
@@ -46,7 +47,7 @@ class VendorListItem extends StatelessWidget {
         : null;
 
     return DismissibleEntity(
-      isSelected: vendor.id ==
+      isSelected: isDesktop(context) && vendor.id ==
           (uiState.isEditing
               ? vendorUIState.editing.id
               : vendorUIState.selectedId),