diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/ScrollToBottomButton/ScrollToBottomButton.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/ScrollToBottomButton/ScrollToBottomButton.tsx
index be0e1399d4b..2b38f6c5a16 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/ScrollToBottomButton/ScrollToBottomButton.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/ScrollToBottomButton/ScrollToBottomButton.tsx
@@ -28,15 +28,11 @@ export function ScrollToBottomButton({ terminal }: ScrollToBottomButtonProps) {
 		checkScrollPosition();
 
 		const writeDisposable = terminal.onWriteParsed(checkScrollPosition);
-		const viewport = terminal.element?.querySelector(".xterm-viewport");
-
-		if (viewport) {
-			viewport.addEventListener("scroll", checkScrollPosition);
-		}
+		const scrollDisposable = terminal.onScroll(checkScrollPosition);
 
 		return () => {
 			writeDisposable.dispose();
-			viewport?.removeEventListener("scroll", checkScrollPosition);
+			scrollDisposable.dispose();
 		};
 	}, [terminal, checkScrollPosition]);
 
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/utils.ts b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/utils.ts
index 95a10d2ea48..e397d2296ff 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/utils.ts
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/utils.ts
@@ -5,17 +5,6 @@ export function shellEscapePaths(paths: string[]): string {
 	return quote(paths);
 }
 
-export function scrollToBottom(
-	terminal: Terminal,
-	behavior: ScrollBehavior = "instant",
-): void {
-	const viewport = terminal.element?.querySelector(".xterm-viewport");
-	if (viewport) {
-		viewport.scrollTo({
-			top: viewport.scrollHeight,
-			behavior,
-		});
-	} else {
-		terminal.scrollToBottom();
-	}
+export function scrollToBottom(terminal: Terminal): void {
+	terminal.scrollToBottom();
 }