diff --git a/detox/e2e/test/messaging/pinned_messages.e2e.js b/detox/e2e/test/messaging/pinned_messages.e2e.js
index 2065ca5c4..24ef7b3f3 100644
--- a/detox/e2e/test/messaging/pinned_messages.e2e.js
+++ b/detox/e2e/test/messaging/pinned_messages.e2e.js
@@ -12,6 +12,7 @@ import {
     ChannelInfoScreen,
     ChannelScreen,
     EditPostScreen,
+    PermalinkScreen,
     PinnedMessagesScreen,
     ThreadScreen,
 } from '@support/ui/screen';
@@ -147,7 +148,7 @@ describe('Pinned Messages', () => {
         await ChannelInfoScreen.close();
     });
 
-    it('MM-T851_2 should be able to open reply thread for pinned message by tapping on search result item', async () => {
+    it('MM-T851_2 should be able to jump to recent messages from pinned post', async () => {
         // # Post a message
         const testMessage = Date.now().toString();
         await postMessage(testMessage);
@@ -157,21 +158,17 @@ describe('Pinned Messages', () => {
         await openPostOptionsFor(post.id, testMessage);
         await pinAction.tap();
 
-        // # Tap on search result item to open reply thread for pinned message
+        // # Jump to recent messages from pinned post
         await ChannelInfoScreen.open();
         await PinnedMessagesScreen.open();
         const {searchResultPostItem} = await PinnedMessagesScreen.getSearchResultPostItem(post.id, testMessage);
         await searchResultPostItem.tap();
+        await PermalinkScreen.jumpToRecentMessages();
 
-        // * Verify message opens in a thread
-        await expect(element(by.text(`${townSquareChannel.display_name} Thread`))).toBeVisible();
-        const {postListPostItem: threadPostItem} = await ThreadScreen.getPostListPostItem(post.id, testMessage);
-        await expect(threadPostItem).toBeVisible();
-
-        // # Go back to channel
-        await ThreadScreen.back();
-        await PinnedMessagesScreen.back();
-        await ChannelInfoScreen.close();
+        // * Verify user is on channel where message is posted
+        await expect(ChannelScreen.channelNavBarTitle).toHaveText(townSquareChannel.display_name);
+        const {postListPostItem: channelPostItem} = await ChannelScreen.getPostListPostItem(post.id, testMessage);
+        await expect(channelPostItem).toBeVisible();
     });
 
     it('MM-T851_3 should be able to open reply thread for pinned message by tapping on search result item reply arrow', async () => {
diff --git a/detox/e2e/test/smoke_test/search.e2e.js b/detox/e2e/test/smoke_test/search.e2e.js
index 6122115df..ff33b27d3 100644
--- a/detox/e2e/test/smoke_test/search.e2e.js
+++ b/detox/e2e/test/smoke_test/search.e2e.js
@@ -13,6 +13,7 @@ import {
 } from '@support/ui/component';
 import {
     ChannelScreen,
+    PermalinkScreen,
     SearchScreen,
     ThreadScreen,
 } from '@support/ui/screen';
@@ -59,7 +60,7 @@ describe('Search', () => {
         await ChannelScreen.logout();
     });
 
-    it('MM-T3235 search on text, go to result', async () => {
+    it('MM-T3235 search on text, jump to result', async () => {
         // # Post message and search on text
         await postMessageAndSearchText(testMessage, testPartialSearchTerm);
 
@@ -69,14 +70,18 @@ describe('Search', () => {
         await expect(searchResultPostItem).toBeVisible();
         await searchResultPostItem.tap();
 
-        // * Verify message opens in a thread
-        await expect(element(by.text(`${testChannel.display_name} Thread`))).toBeVisible();
-        const {postListPostItem: threadPostItem} = await ThreadScreen.getPostListPostItem(lastPost.post.id, testMessage);
-        await expect(threadPostItem).toBeVisible();
+        // * Verify permalink post list has the message
+        await PermalinkScreen.toBeVisible();
+        const {postListPostItem: permalinkPostItem} = await PermalinkScreen.getPostListPostItem(lastPost.post.id, testMessage);
+        await waitFor(permalinkPostItem).toBeVisible();
 
-        // # Go back to channel
-        await ThreadScreen.back();
-        await SearchScreen.cancel();
+        // # Jump to recent messages
+        await PermalinkScreen.jumpToRecentMessages();
+
+        // * Verify user is on channel where message is posted
+        await expect(ChannelScreen.channelNavBarTitle).toHaveText(testChannel.display_name);
+        const {postListPostItem: channelPostItem} = await ChannelScreen.getPostListPostItem(lastPost.post.id, testMessage);
+        await expect(channelPostItem).toBeVisible();
     });
 
     it('MM-T3236 search on sender, select from autocomplete, reply from search results', async () => {