diff --git a/lib/ui/client/client_list.dart b/lib/ui/client/client_list.dart
index 4a6915a60..df70f3114 100644
--- a/lib/ui/client/client_list.dart
+++ b/lib/ui/client/client_list.dart
@@ -30,6 +30,7 @@ class ClientList extends StatelessWidget {
     final clientList = viewModel.clientList;
 
     if (isNotMobile(context) &&
+        !state.uiState.isEditing &&
         clientList.isNotEmpty &&
         !clientList.contains(state.clientUIState.selectedId)) {
       viewEntityById(
diff --git a/lib/ui/expense/expense_list.dart b/lib/ui/expense/expense_list.dart
index c9a87b192..819ea6e9c 100644
--- a/lib/ui/expense/expense_list.dart
+++ b/lib/ui/expense/expense_list.dart
@@ -48,6 +48,7 @@ class ExpenseList extends StatelessWidget {
 
     if (isNotMobile(context) &&
         expenseList.isNotEmpty &&
+        !state.uiState.isEditing &&
         !expenseList.contains(state.expenseUIState.selectedId)) {
       viewEntityById(
           context: context,
diff --git a/lib/ui/invoice/invoice_list.dart b/lib/ui/invoice/invoice_list.dart
index 8de09606a..960f4b007 100644
--- a/lib/ui/invoice/invoice_list.dart
+++ b/lib/ui/invoice/invoice_list.dart
@@ -31,6 +31,7 @@ class InvoiceList extends StatelessWidget {
 
     if (isNotMobile(context) &&
         invoiceList.isNotEmpty &&
+        !state.uiState.isEditing &&
         !invoiceList.contains(state.invoiceUIState.selectedId)) {
       viewEntityById(
           context: context,
diff --git a/lib/ui/payment/payment_list.dart b/lib/ui/payment/payment_list.dart
index c8eaaa759..76bb7ab85 100644
--- a/lib/ui/payment/payment_list.dart
+++ b/lib/ui/payment/payment_list.dart
@@ -33,6 +33,7 @@ class PaymentList extends StatelessWidget {
 
     if (isNotMobile(context) &&
         paymentList.isNotEmpty &&
+        !state.uiState.isEditing &&
         !paymentList.contains(state.paymentUIState.selectedId)) {
       viewEntityById(
           context: context,
diff --git a/lib/ui/product/product_list.dart b/lib/ui/product/product_list.dart
index 8985877aa..c8c93d3c4 100644
--- a/lib/ui/product/product_list.dart
+++ b/lib/ui/product/product_list.dart
@@ -55,6 +55,7 @@ class _ProductListState extends State<ProductList> {
 
     if (isNotMobile(context) &&
         productList.isNotEmpty &&
+        !state.uiState.isEditing &&
         !productList.contains(state.productUIState.selectedId)) {
       viewEntityById(
           context: context,
diff --git a/lib/ui/project/project_list.dart b/lib/ui/project/project_list.dart
index 89fdb7a91..fdcc26991 100644
--- a/lib/ui/project/project_list.dart
+++ b/lib/ui/project/project_list.dart
@@ -33,6 +33,7 @@ class ProjectList extends StatelessWidget {
 
     if (isNotMobile(context) &&
         projectList.isNotEmpty &&
+        !state.uiState.isEditing &&
         !projectList.contains(state.projectUIState.selectedId)) {
       viewEntityById(
           context: context,
diff --git a/lib/ui/task/task_list.dart b/lib/ui/task/task_list.dart
index cb76d0c65..fb569ef7c 100644
--- a/lib/ui/task/task_list.dart
+++ b/lib/ui/task/task_list.dart
@@ -31,6 +31,7 @@ class TaskList extends StatelessWidget {
 
     if (isNotMobile(context) &&
         taskList.isNotEmpty &&
+        !state.uiState.isEditing &&
         !taskList.contains(state.taskUIState.selectedId)) {
       viewEntityById(
           context: context,
diff --git a/lib/ui/vendor/vendor_list.dart b/lib/ui/vendor/vendor_list.dart
index ad96d5a34..5a1602f79 100644
--- a/lib/ui/vendor/vendor_list.dart
+++ b/lib/ui/vendor/vendor_list.dart
@@ -32,6 +32,7 @@ class VendorList extends StatelessWidget {
 
     if (isNotMobile(context) &&
         vendorList.isNotEmpty &&
+        !state.uiState.isEditing &&
         !vendorList.contains(state.vendorUIState.selectedId)) {
       viewEntityById(
           context: context,
diff --git a/stubs/ui/stub/stub_list b/stubs/ui/stub/stub_list
index 4da0f7a56..a42c51f84 100644
--- a/stubs/ui/stub/stub_list
+++ b/stubs/ui/stub/stub_list
@@ -37,6 +37,7 @@ class StubList extends StatelessWidget {
 
     if (isNotMobile(context) &&
         stubList.isNotEmpty &&
+        !state.uiState.isEditing &&
         !stubList.contains(state.stubUIState.selectedId)) {
       viewEntityById(
           context: context,