diff --git a/lib/ui/app/entity_top_filter.dart b/lib/ui/app/entity_top_filter.dart
index 0593c715d..cd94a1ede 100644
--- a/lib/ui/app/entity_top_filter.dart
+++ b/lib/ui/app/entity_top_filter.dart
@@ -319,7 +319,11 @@ class EntityTopFilterHeader extends StatelessWidget {
                 final entityType = uiState.filterEntityType;
                 if (entityType.hasFullWidthViewer &&
                     state.prefState.isViewerFullScreen(entityType)) {
-                  viewEntitiesByType(entityType: entityType);
+                  viewEntitiesByType(
+                      entityType: entityType,
+                      page: state.historyList.length >= 2
+                          ? state.historyList[1].page
+                          : 0);
                 } else {
                   store.dispatch(
                     FilterByEntity(entity: uiState.filterEntity),
diff --git a/lib/ui/app/history_drawer.dart b/lib/ui/app/history_drawer.dart
index 6a4d724b3..060eeaba8 100644
--- a/lib/ui/app/history_drawer.dart
+++ b/lib/ui/app/history_drawer.dart
@@ -135,10 +135,6 @@ class _HistoryListTileState extends State<HistoryListTile> {
       }
     } else if (history.id == null) {
       title = Text(localization.lookup(history.entityType.plural));
-
-      if (!kReleaseMode) {
-        subtitle = Text('Page: ${history.page}');
-      }
     } else {
       entity = state.getEntityMap(history.entityType)[history.id] as BaseEntity;
 
diff --git a/lib/ui/app/menu_drawer.dart b/lib/ui/app/menu_drawer.dart
index a49c5fe59..399119acb 100644
--- a/lib/ui/app/menu_drawer.dart
+++ b/lib/ui/app/menu_drawer.dart
@@ -134,7 +134,6 @@ class _MenuDrawerState extends State<MenuDrawer> {
                                 break;
                               default:
                                 if ((history.id ?? '').isEmpty) {
-                                  print('## PAGE: ${history.page}');
                                   viewEntitiesByType(
                                       entityType: history.entityType,
                                       page: history.page);