diff --git a/desktop/src/features/messages/ui/MessageComposer.tsx b/desktop/src/features/messages/ui/MessageComposer.tsx
index 5d92b3c25..c60976de5 100644
--- a/desktop/src/features/messages/ui/MessageComposer.tsx
+++ b/desktop/src/features/messages/ui/MessageComposer.tsx
@@ -57,8 +57,8 @@ import { useDraftPersistLifecycle } from "./useDraftPersistSnapshot";
 import {
   MessageComposerAutocompletes,
   MessageComposerUploadError,
+  useComposerScrollToBottom,
 } from "./MessageComposerOverlays";
-import { useComposerScrollToBottom } from "./useComposerScrollToBottom";
 
 import type { MessageComposerProps } from "./MessageComposer.types";
 
diff --git a/desktop/src/features/messages/ui/MessageComposerOverlays.tsx b/desktop/src/features/messages/ui/MessageComposerOverlays.tsx
index 67b4f030b..cf2b5fde4 100644
--- a/desktop/src/features/messages/ui/MessageComposerOverlays.tsx
+++ b/desktop/src/features/messages/ui/MessageComposerOverlays.tsx
@@ -1,3 +1,4 @@
+import * as React from "react";
 import type { ChannelSuggestion } from "@/features/messages/lib/useChannelLinks";
 import type { useChannelLinks } from "@/features/messages/lib/useChannelLinks";
 import type { EmojiSuggestion } from "@/features/messages/lib/useEmojiAutocomplete";
@@ -10,6 +11,18 @@ import {
   type MentionSuggestion,
 } from "./MentionAutocomplete";
 
+export function useComposerScrollToBottom(
+  composerScrollRef: React.RefObject<HTMLDivElement | null>,
+) {
+  return React.useCallback(() => {
+    window.requestAnimationFrame(() => {
+      const scrollElement = composerScrollRef.current;
+      if (!scrollElement) return;
+      scrollElement.scrollTop = scrollElement.scrollHeight;
+    });
+  }, [composerScrollRef]);
+}
+
 export function MessageComposerAutocompletes({
   applyChannelInsert,
   applyEmojiInsert,
diff --git a/desktop/src/features/messages/ui/useComposerScrollToBottom.ts b/desktop/src/features/messages/ui/useComposerScrollToBottom.ts
deleted file mode 100644
index 9d07efb3a..000000000
--- a/desktop/src/features/messages/ui/useComposerScrollToBottom.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import * as React from "react";
-
-export function useComposerScrollToBottom(
-  composerScrollRef: React.RefObject<HTMLDivElement | null>,
-) {
-  return React.useCallback(() => {
-    window.requestAnimationFrame(() => {
-      const scrollElement = composerScrollRef.current;
-      if (!scrollElement) return;
-      scrollElement.scrollTop = scrollElement.scrollHeight;
-    });
-  }, [composerScrollRef]);
-}