diff --git a/lib/ui/client/client_list_vm.dart b/lib/ui/client/client_list_vm.dart
index 25b89fe00..e4ec07351 100644
--- a/lib/ui/client/client_list_vm.dart
+++ b/lib/ui/client/client_list_vm.dart
@@ -137,8 +137,7 @@ class ClientListVM {
       onClientTap: (context, client) {
         if (store.state.clientListState.isInMultiselect()) {
           handleClientAction(context, [client], EntityAction.toggleMultiselect);
-        } else if (isDesktop(context) &&
-            state.clientUIState.editing.id == client.id) {
+        } else if (isDesktop(context) && state.uiState.isEditing) {
           viewEntity(context: context, entity: client);
         } else if (isDesktop(context) &&
             state.clientUIState.selectedId == client.id) {
diff --git a/lib/ui/credit/credit_list_vm.dart b/lib/ui/credit/credit_list_vm.dart
index 1d51134bc..9bd414997 100644
--- a/lib/ui/credit/credit_list_vm.dart
+++ b/lib/ui/credit/credit_list_vm.dart
@@ -156,8 +156,7 @@ class CreditListVM extends EntityListVM {
         if (store.state.invoiceListState.isInMultiselect()) {
           handleInvoiceAction(
               context, [credit], EntityAction.toggleMultiselect);
-        } else if (isDesktop(context) &&
-            state.creditUIState.editing.id == credit.id) {
+        } else if (isDesktop(context) && state.uiState.isEditing) {
           viewEntity(context: context, entity: credit);
         } else if (isDesktop(context) &&
             state.creditUIState.selectedId == credit.id) {
diff --git a/lib/ui/expense/expense_list_vm.dart b/lib/ui/expense/expense_list_vm.dart
index cb8324c1e..b3d47bb7a 100644
--- a/lib/ui/expense/expense_list_vm.dart
+++ b/lib/ui/expense/expense_list_vm.dart
@@ -141,8 +141,7 @@ class ExpenseListVM {
         if (store.state.expenseListState.isInMultiselect()) {
           handleExpenseAction(
               context, [expense], EntityAction.toggleMultiselect);
-        } else if (isDesktop(context) &&
-            state.expenseUIState.editing.id == expense.id) {
+        } else if (isDesktop(context) && state.uiState.isEditing) {
           viewEntity(context: context, entity: expense);
         } else if (isDesktop(context) &&
             state.expenseUIState.selectedId == expense.id) {
diff --git a/lib/ui/invoice/invoice_list_vm.dart b/lib/ui/invoice/invoice_list_vm.dart
index 2f7e7556e..f46972928 100644
--- a/lib/ui/invoice/invoice_list_vm.dart
+++ b/lib/ui/invoice/invoice_list_vm.dart
@@ -197,8 +197,7 @@ class InvoiceListVM extends EntityListVM {
         if (store.state.invoiceListState.isInMultiselect()) {
           handleInvoiceAction(
               context, [invoice], EntityAction.toggleMultiselect);
-        } else if (isDesktop(context) &&
-            state.invoiceUIState.editing.id == invoice.id) {
+        } else if (isDesktop(context) && state.uiState.isEditing) {
           viewEntity(context: context, entity: invoice);
         } else if (isDesktop(context) &&
             state.invoiceUIState.selectedId == invoice.id) {
diff --git a/lib/ui/payment/payment_list_vm.dart b/lib/ui/payment/payment_list_vm.dart
index 2807c19cc..39340b6c4 100644
--- a/lib/ui/payment/payment_list_vm.dart
+++ b/lib/ui/payment/payment_list_vm.dart
@@ -136,8 +136,7 @@ class PaymentListVM {
         if (store.state.paymentListState.isInMultiselect()) {
           handlePaymentAction(
               context, [payment], EntityAction.toggleMultiselect);
-        } else if (isDesktop(context) &&
-            state.paymentUIState.editing.id == payment.id) {
+        } else if (isDesktop(context) && state.uiState.isEditing) {
           viewEntity(context: context, entity: payment);
         } else if (isDesktop(context) &&
             state.paymentUIState.selectedId == payment.id) {
diff --git a/lib/ui/product/product_list_vm.dart b/lib/ui/product/product_list_vm.dart
index 02149a777..7064ce27c 100644
--- a/lib/ui/product/product_list_vm.dart
+++ b/lib/ui/product/product_list_vm.dart
@@ -119,8 +119,7 @@ class ProductListVM {
         if (store.state.productListState.isInMultiselect()) {
           handleProductAction(
               context, [product], EntityAction.toggleMultiselect);
-        } else if (isDesktop(context) &&
-            state.productUIState.editing.id == product.id) {
+        } else if (isDesktop(context) && state.uiState.isEditing) {
           viewEntity(context: context, entity: product);
         } else if (isDesktop(context) &&
             state.productUIState.selectedId == product.id) {
diff --git a/lib/ui/project/project_list_vm.dart b/lib/ui/project/project_list_vm.dart
index 439c7f72f..4b70c2097 100644
--- a/lib/ui/project/project_list_vm.dart
+++ b/lib/ui/project/project_list_vm.dart
@@ -139,8 +139,7 @@ class ProjectListVM {
         if (store.state.projectListState.isInMultiselect()) {
           handleProjectAction(
               context, [project], EntityAction.toggleMultiselect);
-        } else if (isDesktop(context) &&
-            state.projectUIState.editing.id == project.id) {
+        } else if (isDesktop(context) && state.uiState.isEditing) {
           viewEntity(context: context, entity: project);
         } else if (isDesktop(context) &&
             state.projectUIState.selectedId == project.id) {
diff --git a/lib/ui/quote/quote_list_vm.dart b/lib/ui/quote/quote_list_vm.dart
index 82875fabe..c2634273f 100644
--- a/lib/ui/quote/quote_list_vm.dart
+++ b/lib/ui/quote/quote_list_vm.dart
@@ -155,8 +155,7 @@ class QuoteListVM extends EntityListVM {
         if (store.state.invoiceListState.isInMultiselect()) {
           handleInvoiceAction(
               context, [quote], EntityAction.toggleMultiselect);
-        } else if (isDesktop(context) &&
-            state.quoteUIState.editing.id == quote.id) {
+        } else if (isDesktop(context) && state.uiState.isEditing) {
           viewEntity(context: context, entity: quote);
         } else if (isDesktop(context) &&
             state.quoteUIState.selectedId == quote.id) {
diff --git a/lib/ui/task/task_list_vm.dart b/lib/ui/task/task_list_vm.dart
index 9ffb058bf..bb0e9a31a 100644
--- a/lib/ui/task/task_list_vm.dart
+++ b/lib/ui/task/task_list_vm.dart
@@ -144,8 +144,7 @@ class TaskListVM {
       onTaskTap: (context, task) {
         if (store.state.taskListState.isInMultiselect()) {
           handleTaskAction(context, [task], EntityAction.toggleMultiselect);
-        } else if (isDesktop(context) &&
-            state.taskUIState.editing.id == task.id) {
+        } else if (isDesktop(context) && state.uiState.isEditing) {
           viewEntity(context: context, entity: task);
         } else if (isDesktop(context) &&
             state.taskUIState.selectedId == task.id) {
diff --git a/lib/ui/vendor/vendor_list_vm.dart b/lib/ui/vendor/vendor_list_vm.dart
index 725c31a92..579fee439 100644
--- a/lib/ui/vendor/vendor_list_vm.dart
+++ b/lib/ui/vendor/vendor_list_vm.dart
@@ -129,8 +129,7 @@ class VendorListVM {
       onVendorTap: (context, vendor) {
         if (store.state.vendorListState.isInMultiselect()) {
           handleVendorAction(context, [vendor], EntityAction.toggleMultiselect);
-        } else if (isDesktop(context) &&
-            state.vendorUIState.editing.id == vendor.id) {
+        } else if (isDesktop(context) && state.uiState.isEditing) {
           viewEntity(context: context, entity: vendor);
         } else if (isDesktop(context) &&
             state.vendorUIState.selectedId == vendor.id) {
diff --git a/stubs/ui/stub/stub_list_vm b/stubs/ui/stub/stub_list_vm
index 60f426c75..263d14bd3 100644
--- a/stubs/ui/stub/stub_list_vm
+++ b/stubs/ui/stub/stub_list_vm
@@ -132,8 +132,7 @@ class StubListVM {
           if (store.state.stubListState.isInMultiselect()) {
             handleStubAction(
                 context, [stub], EntityAction.toggleMultiselect);
-        } else if (isDesktop(context) &&
-            state.stubUIState.editing.id == stub.id) {
+        } else if (isDesktop(context) && state.uiState.isEditing) {
           viewEntity(context: context, entity: stub);
         } else if (isDesktop(context) &&
             state.stubUIState.selectedId == stub.id) {