diff --git a/lib/ui/app/history_drawer.dart b/lib/ui/app/history_drawer.dart
index d78903d85..d8ddb2534 100644
--- a/lib/ui/app/history_drawer.dart
+++ b/lib/ui/app/history_drawer.dart
@@ -195,7 +195,6 @@ class _HistoryListTileState extends State<HistoryListTile> {
 
          */
         onTap: () {
-          store.dispatch(ClearEntityFilter());
           if (state.prefState.isHistoryFloated) {
             Navigator.pop(context);
           }
@@ -212,9 +211,11 @@ class _HistoryListTileState extends State<HistoryListTile> {
               break;
             default:
               viewEntityById(
-                  context: context,
-                  entityId: history.id,
-                  entityType: history.entityType);
+                context: context,
+                entityId: history.id,
+                entityType: history.entityType,
+                ensureVisible: true,
+              );
           }
         },
         onLongPress: entity == null
diff --git a/lib/ui/app/main_screen.dart b/lib/ui/app/main_screen.dart
index 16f1e0612..b9a0628f5 100644
--- a/lib/ui/app/main_screen.dart
+++ b/lib/ui/app/main_screen.dart
@@ -723,7 +723,10 @@ class _EntityFilter extends StatelessWidget {
                     SizedBox(width: 4),
                     IconButton(
                       icon: Icon(Icons.clear),
-                      onPressed: () => store.dispatch(ClearEntityFilter()),
+                      onPressed: () => store.dispatch(FilterByEntity(
+                        entityId: uiState.filterEntityId,
+                        entityType: uiState.filterEntityType,
+                      )),
                     ),
                   ],
           ),