diff --git a/mobile/lib/app.dart b/mobile/lib/app.dart
index d4b8525404..bc406d7c33 100644
--- a/mobile/lib/app.dart
+++ b/mobile/lib/app.dart
@@ -13,18 +13,13 @@ import 'package:media_extension/media_extension_action_types.dart';
 import 'package:photos/ente_theme_data.dart';
 import "package:photos/generated/l10n.dart";
 import "package:photos/l10n/l10n.dart";
-import "package:photos/models/collection/collection_items.dart";
 import 'package:photos/services/app_lifecycle_service.dart';
-import "package:photos/services/collections_service.dart";
-import "package:photos/services/favorites_service.dart";
 import "package:photos/services/home_widget_service.dart";
 import "package:photos/services/machine_learning/machine_learning_controller.dart";
 import 'package:photos/services/sync_service.dart';
 import 'package:photos/ui/tabs/home_widget.dart';
 import "package:photos/ui/viewer/actions/file_viewer.dart";
-import "package:photos/ui/viewer/gallery/collection_page.dart";
 import "package:photos/utils/intent_util.dart";
-import "package:photos/utils/navigation_util.dart";
 
 class EnteApp extends StatefulWidget {
   final Future<void> Function(String) runBackgroundTask;
@@ -66,39 +61,14 @@ class _EnteAppState extends State<EnteApp> with WidgetsBindingObserver {
   void didChangeDependencies() {
     super.didChangeDependencies();
     _checkForWidgetLaunch();
-    hw.HomeWidget.widgetClicked.listen(_launchedFromWidget);
   }
 
   void _checkForWidgetLaunch() {
-    hw.HomeWidget.initiallyLaunchedFromHomeWidget().then(_launchedFromWidget);
-  }
-
-  Future<void> _launchedFromWidget(Uri? uri) async {
-    if (uri == null) return;
-    final collectionID =
-        await FavoritesService.instance.getFavoriteCollectionID();
-    if (collectionID == null) {
-      return;
-    }
-    final collection = CollectionsService.instance.getCollectionByID(
-      collectionID,
+    hw.HomeWidget.initiallyLaunchedFromHomeWidget().then(
+      (uri) => HomeWidgetService.instance.onLaunchFromWidget(uri, context),
     );
-    if (collection == null) {
-      return;
-    }
-    unawaited(HomeWidgetService.instance.initHomeWidget());
-
-    final thumbnail = await CollectionsService.instance.getCover(collection);
-    unawaited(
-      routeToPage(
-        context,
-        CollectionPage(
-          CollectionWithThumbnail(
-            collection,
-            thumbnail,
-          ),
-        ),
-      ),
+    hw.HomeWidget.widgetClicked.listen(
+      (uri) => HomeWidgetService.instance.onLaunchFromWidget(uri, context),
     );
   }
 
diff --git a/mobile/lib/services/home_widget_service.dart b/mobile/lib/services/home_widget_service.dart
index 33ef5d2bbc..7b44310c21 100644
--- a/mobile/lib/services/home_widget_service.dart
+++ b/mobile/lib/services/home_widget_service.dart
@@ -8,9 +8,14 @@ import "package:logging/logging.dart";
 import "package:photos/core/configuration.dart";
 import "package:photos/core/constants.dart";
 import "package:photos/db/files_db.dart";
+import "package:photos/models/collection/collection_items.dart";
 import "package:photos/models/file/file_type.dart";
+import "package:photos/services/collections_service.dart";
 import "package:photos/services/favorites_service.dart";
+import "package:photos/ui/viewer/file/detail_page.dart";
+import "package:photos/ui/viewer/gallery/collection_page.dart";
 import "package:photos/utils/file_util.dart";
+import "package:photos/utils/navigation_util.dart";
 import "package:photos/utils/preload_util.dart";
 
 class HomeWidgetService {
@@ -171,4 +176,49 @@ class HomeWidgetService {
     );
     _logger.info(">>> SlideshowWidget cleared");
   }
+
+  Future<void> onLaunchFromWidget(Uri? uri, BuildContext context) async {
+    if (uri == null) return;
+
+    final collectionID =
+        await FavoritesService.instance.getFavoriteCollectionID();
+    if (collectionID == null) {
+      return;
+    }
+
+    final collection = CollectionsService.instance.getCollectionByID(
+      collectionID,
+    );
+    if (collection == null) {
+      return;
+    }
+
+    final thumbnail = await CollectionsService.instance.getCover(collection);
+
+    final previousGeneratedId =
+        await hw.HomeWidget.getWidgetData<int>("home_widget_last_img");
+
+    final res = previousGeneratedId != null
+        ? await FilesDB.instance.getFile(
+            previousGeneratedId,
+          )
+        : null;
+
+    routeToPage(
+      context,
+      CollectionPage(
+        CollectionWithThumbnail(
+          collection,
+          thumbnail,
+        ),
+      ),
+    ).ignore();
+
+    if (res == null) return;
+
+    final page = DetailPage(
+      DetailPageConfiguration(List.unmodifiable([res]), null, 0, "collection"),
+    );
+    routeToPage(context, page, forceCustomPageRoute: true).ignore();
+  }
 }
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index bab6f37caa..393dadc237 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -705,10 +705,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
-      sha256: a701df4866f9a38bb8e4450a54c143bbeeb0ce2381e7df5a36e1006f3b43bb28
+      sha256: f9a05409385b77b06c18f200a41c7c2711ebf7415669350bb0f8474c07bd40d1
       url: "https://pub.dev"
     source: hosted
-    version: "17.0.1"
+    version: "17.0.0"
   flutter_local_notifications_linux:
     dependency: transitive
     description: