diff --git a/mobile/lib/features/activity/activity_page.dart b/mobile/lib/features/activity/activity_page.dart
index 0d634ee224..1e7beec1fa 100644
--- a/mobile/lib/features/activity/activity_page.dart
+++ b/mobile/lib/features/activity/activity_page.dart
@@ -336,7 +336,9 @@ class ActivityPage extends HookConsumerWidget {
                   channel: channel,
                   currentPubkey: myPk,
                   isDone: isDone(item),
-                  selected: isWideInbox && item.id == selectedItemId.value,
+                  selected:
+                      isWideInbox &&
+                      item.conversationId == selectedItemId.value,
                   onTap: () => openItem(item),
                   onMarkRead: () => markItemRead(item),
                   onMarkUnread: () => markItemUnread(item),
@@ -361,9 +363,6 @@ class ActivityPage extends HookConsumerWidget {
             dueReminderCount: dueReminderCount,
             draftCount: drafts.length,
             onChanged: (nextFilter) {
-              selectedItemId.value = null;
-              selectedItemTarget.value = null;
-              selectedItemForDetail.value = null;
               filter.value = nextFilter;
             },
           ),
diff --git a/mobile/test/features/activity/activity_page_test.dart b/mobile/test/features/activity/activity_page_test.dart
index fc9904764c..2b88af6ce4 100644
--- a/mobile/test/features/activity/activity_page_test.dart
+++ b/mobile/test/features/activity/activity_page_test.dart
@@ -244,6 +244,8 @@ void main() {
     );
     await tester.pumpAndSettle();
 
+    await tester.tap(find.byKey(const ValueKey('inbox-row-m2')));
+    await tester.pumpAndSettle();
     expect(find.byType(ChannelDetailPage), findsOneWidget);
     await tester.tap(find.byKey(const ValueKey('activity-filter-menu')));
     await tester.pumpAndSettle();