From c61d74ade3d3d5d0ffbe4ab7f0776c2a66dc974e Mon Sep 17 00:00:00 2001
From: Gimle Larpes <gimlelarpes@gmail.com>
Date: Fri, 13 Jun 2025 01:44:07 +0200
Subject: [PATCH] Prepare for PR #2335

---
 src/app/features/room/RoomView.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/app/features/room/RoomView.tsx b/src/app/features/room/RoomView.tsx
index b1f5f198..64122d37 100644
--- a/src/app/features/room/RoomView.tsx
+++ b/src/app/features/room/RoomView.tsx
@@ -65,7 +65,6 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) {
   const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
 
   const screenSize = useScreenSizeContext();
-
   const { roomId } = room;
   const editor = useEditor();
 
@@ -103,7 +102,7 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) {
   );
 
   useEffect(() => {
-    if (screenSize === ScreenSize.Desktop && canMessage) {
+    if (screenSize === ScreenSize.Desktop && canMessage && editor) {
       ReactEditor.focus(editor);
     }
   }, [editor, screenSize, canMessage]);