diff --git a/lib/redux/app/app_actions.dart b/lib/redux/app/app_actions.dart
index 584056875..957e27809 100644
--- a/lib/redux/app/app_actions.dart
+++ b/lib/redux/app/app_actions.dart
@@ -413,7 +413,6 @@ void viewEntitiesByType({
           case EntityType.schedule:
             action = ViewScheduleList();
             break;
-
           case EntityType.transactionRule:
             action = ViewTransactionRuleList();
             break;
@@ -464,6 +463,10 @@ void viewEntitiesByType({
         if (action != null) {
           store.dispatch(action);
         }
+
+        if (filterEntity != null) {
+          store.dispatch(PopLastHistory());
+        }
       });
 }
 
diff --git a/starter.sh b/starter.sh
index 192bcb0c0..234557275 100644
--- a/starter.sh
+++ b/starter.sh
@@ -398,6 +398,7 @@ else
 
     comment="STARTER: history - do not remove comment"
     code="TypedReducer<BuiltList<HistoryRecord>, View${Module}>((historyList, action) => _addToHistory(historyList, HistoryRecord(id: action.${module_camel}Id, entityType: EntityType.${module_camel}))),TypedReducer<BuiltList<HistoryRecord>, Edit${Module}>((historyList, action) => _addToHistory(historyList, HistoryRecord(id: action.${module_camel}.id, entityType: EntityType.${module_camel}))),${lineBreak}"
+    code="${code}TypedReducer<BuiltList<HistoryRecord>, View${Module}List>((historyList, action) => _addToHistory(historyList, HistoryRecord(id: action.${module_camel}Id, entityType: EntityType.${module_camel}))),TypedReducer<BuiltList<HistoryRecord>, Edit${Module}>((historyList, action) => _addToHistory(historyList, HistoryRecord(entityType: EntityType.${module_camel}))),${lineBreak}"
     sed -i -e "s/$comment/$comment${lineBreak}$code/g" ./lib/redux/ui/pref_reducer.dart
 
     comment="STARTER: import - do not remove comment"