diff --git a/lib/redux/app/app_actions.dart b/lib/redux/app/app_actions.dart
index b7dda7087..4236552ab 100644
--- a/lib/redux/app/app_actions.dart
+++ b/lib/redux/app/app_actions.dart
@@ -1400,7 +1400,8 @@ void selectEntity({
       store.dispatch(UpdateUserPreferences(showFilterSidebar: true));
       viewEntitiesByType(entityType: entity.entityType.relatedTypes.first);
       filterByEntity(context: context, entity: entity);
-    } else if (uiState.isEditing && entityUIState.editingId == entity.id) {
+    } else if ((uiState.isEditing && entityUIState.editingId == entity.id) ||
+        entity.entityType.isSetting) {
       viewEntity(entity: entity);
     } else {
       editEntity(context: context, entity: entity);