diff --git a/lib/redux/app/app_state.dart b/lib/redux/app/app_state.dart
index 25c021d6f..195945a09 100644
--- a/lib/redux/app/app_state.dart
+++ b/lib/redux/app/app_state.dart
@@ -205,11 +205,12 @@ abstract class AppState implements Built<AppState, AppStateBuilder> {
             prefState.moduleLayout == ModuleLayout.table) ||
         uiState.isEditing ||
         entityType.isSetting ||
-        entityList.isEmpty) {
+        (entityList.isEmpty && (entityUIState.selectedId ?? '').isEmpty)) {
       return false;
     }
 
-    if ((entityUIState.selectedId ?? '').isEmpty) {
+    if ((entityUIState.selectedId ?? '').isEmpty ||
+        !entityList.contains(entityUIState.selectedId)) {
       return true;
     } else if (unfilteredHistoryList.isNotEmpty &&
         uiState.isViewing &&
@@ -424,13 +425,17 @@ abstract class AppState implements Built<AppState, AppStateBuilder> {
 
   // STARTER: state getters - do not remove comment
   TaskStatusState get taskStatusState => userCompanyState.taskStatusState;
+
   ListUIState get taskStatusListState => uiState.taskStatusUIState.listUIState;
+
   TaskStatusUIState get taskStatusUIState => uiState.taskStatusUIState;
 
   ExpenseCategoryState get expenseCategoryState =>
       userCompanyState.expenseCategoryState;
+
   ListUIState get expenseCategoryListState =>
       uiState.expenseCategoryUIState.listUIState;
+
   ExpenseCategoryUIState get expenseCategoryUIState =>
       uiState.expenseCategoryUIState;
 
diff --git a/lib/utils/i18n.dart b/lib/utils/i18n.dart
index 2f12ea958..eed3b0c67 100644
--- a/lib/utils/i18n.dart
+++ b/lib/utils/i18n.dart
@@ -4904,12 +4904,18 @@ mixin LocalizationsProvider on LocaleCodeAware {
       return key;
     }
 
-    if (!_localizedValues[localeCode].containsKey(lookupKey)) {
-      print('ERROR: localization key not found - |$key|');
-    }
-
-    return _localizedValues[localeCode][lookupKey] ??
+    final value = _localizedValues[localeCode][lookupKey] ??
         _localizedValues[localeCode][lookupKey.replaceFirst('_id', '')] ??
         key;
+
+    if (value.isEmpty) {
+      print('ERROR: localization key not found - $key');
+
+      final englishValue = _localizedValues['en'][lookupKey];
+
+      return englishValue.isEmpty ? key : englishValue;
+    }
+
+    return value;
   }
 }