diff --git a/app/soapbox/queries/__tests__/chats.test.ts b/app/soapbox/queries/__tests__/chats.test.ts
index 7640fd511..3d72b9c0f 100644
--- a/app/soapbox/queries/__tests__/chats.test.ts
+++ b/app/soapbox/queries/__tests__/chats.test.ts
@@ -11,8 +11,6 @@ import { flattenPages } from 'soapbox/utils/queries';
 import { IAccount } from '../accounts';
 import { ChatKeys, IChat, IChatMessage, isLastMessage, useChat, useChatActions, useChatMessages, useChats } from '../chats';
 
-jest.mock('soapbox/utils/queries');
-
 const chat: IChat = {
   accepted: true,
   account: {
diff --git a/app/soapbox/queries/chats.ts b/app/soapbox/queries/chats.ts
index 9a119f5f1..4c377abb7 100644
--- a/app/soapbox/queries/chats.ts
+++ b/app/soapbox/queries/chats.ts
@@ -8,6 +8,7 @@ import { ChatWidgetScreens, useChatContext } from 'soapbox/contexts/chat-context
 import { useStatContext } from 'soapbox/contexts/stat-context';
 import { useApi, useAppDispatch, useAppSelector, useFeatures, useOwnAccount } from 'soapbox/hooks';
 import { normalizeChatMessage } from 'soapbox/normalizers';
+import { reOrderChatListItems } from 'soapbox/utils/chats';
 import { flattenPages, PaginatedResult, updatePageItem } from 'soapbox/utils/queries';
 
 import { queryClient } from './client';
@@ -280,6 +281,7 @@ const useChatActions = (chatId: string) => {
       onSuccess: (response, variables) => {
         const nextChat = { ...chat, last_message: response.data };
         updatePageItem(ChatKeys.chatSearch(), nextChat, (o, n) => o.id === n.id);
+        reOrderChatListItems();
 
         queryClient.invalidateQueries(ChatKeys.chatMessages(variables.chatId));
       },
diff --git a/app/soapbox/utils/__mocks__/queries.ts b/app/soapbox/utils/__mocks__/queries.ts
deleted file mode 100644
index efc7447a3..000000000
--- a/app/soapbox/utils/__mocks__/queries.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { InfiniteData, QueryKey, UseInfiniteQueryResult } from '@tanstack/react-query';
-
-import { queryClient } from 'soapbox/jest/test-helpers';
-
-import { PaginatedResult } from '../queries';
-
-const flattenPages = <T>(queryData: UseInfiniteQueryResult<PaginatedResult<T>>['data']) => {
-  return queryData?.pages.reduce<T[]>(
-    (prev: T[], curr) => [...curr.result, ...prev],
-    [],
-  );
-};
-
-const updatePageItem = <T>(queryKey: QueryKey, newItem: T, isItem: (item: T, newItem: T) => boolean) => {
-  queryClient.setQueriesData<InfiniteData<PaginatedResult<T>>>(queryKey, (data) => {
-    if (data) {
-      const pages = data.pages.map(page => {
-        const result = page.result.map(item => isItem(item, newItem) ? newItem : item);
-        return { ...page, result };
-      });
-      return { ...data, pages };
-    }
-  });
-};
-
-/** Insert the new item at the beginning of the first page. */
-const appendPageItem = <T>(queryKey: QueryKey, newItem: T) => {
-  queryClient.setQueryData<InfiniteData<PaginatedResult<T>>>(queryKey, (data) => {
-    if (data) {
-      const pages = [...data.pages];
-      pages[0] = { ...pages[0], result: [...pages[0].result, newItem] };
-      return { ...data, pages };
-    }
-  });
-};
-
-/** Remove an item inside if found. */
-const removePageItem = <T>(queryKey: QueryKey, itemToRemove: T, isItem: (item: T, newItem: T) => boolean) => {
-  queryClient.setQueriesData<InfiniteData<PaginatedResult<T>>>(queryKey, (data) => {
-    if (data) {
-      const pages = data.pages.map(page => {
-        const result = page.result.filter(item => !isItem(item, itemToRemove));
-        return { ...page, result };
-      });
-      return { ...data, pages };
-    }
-  });
-};
-
-export {
-  flattenPages,
-  updatePageItem,
-  appendPageItem,
-  removePageItem,
-};
\ No newline at end of file
diff --git a/app/soapbox/utils/chats.ts b/app/soapbox/utils/chats.ts
index 53676c898..71a416562 100644
--- a/app/soapbox/utils/chats.ts
+++ b/app/soapbox/utils/chats.ts
@@ -26,7 +26,10 @@ const updateChatInChatSearchQuery = (newChat: ChatPayload) => {
  */
 const reOrderChatListItems = () => {
   sortQueryData<ChatPayload>(ChatKeys.chatSearch(), (chatA, chatB) => {
-    return compareDate(chatA.last_message?.created_at as string, chatB.last_message?.created_at as string);
+    return compareDate(
+      chatA.last_message?.created_at as string,
+      chatB.last_message?.created_at as string,
+    );
   });
 };
 
@@ -81,4 +84,4 @@ const getUnreadChatsCount = (): number => {
   return sumBy(chats, chat => chat.unread);
 };
 
-export { updateChatListItem, getUnreadChatsCount };
\ No newline at end of file
+export { updateChatListItem, getUnreadChatsCount, reOrderChatListItems };
\ No newline at end of file