diff --git a/src/app/organisms/room/RoomViewContent.jsx b/src/app/organisms/room/RoomViewContent.jsx
index c7ba8f9..6f4e433 100644
--- a/src/app/organisms/room/RoomViewContent.jsx
+++ b/src/app/organisms/room/RoomViewContent.jsx
@@ -608,9 +608,11 @@ function RoomViewContent({ eventId, roomTimeline }) {
         }
       }
 
-      unreadDivider = (readEvent && !unreadDivider
-        && prevMEvent?.getTs() <= readEvent.getTs()
-        && readEvent.getTs() < mEvent.getTs());
+      if (!unreadDivider) {
+        unreadDivider = (readEvent
+          && prevMEvent?.getTs() <= readEvent.getTs()
+          && readEvent.getTs() < mEvent.getTs());
+      }
       if (unreadDivider) {
         tl.push(<Divider key={`new-${mEvent.getId()}`} variant="positive" text="New messages" />);
         itemCountIndex += 1;
diff --git a/src/app/organisms/room/RoomViewInput.jsx b/src/app/organisms/room/RoomViewInput.jsx
index 94e5c82..87d3b5b 100644
--- a/src/app/organisms/room/RoomViewInput.jsx
+++ b/src/app/organisms/room/RoomViewInput.jsx
@@ -166,6 +166,7 @@ function RoomViewInput({
       if (textAreaRef?.current === null) return;
 
       const msg = textAreaRef.current.value;
+      textAreaRef.current.style.height = 'unset';
       inputBaseRef.current.style.backgroundImage = 'unset';
       if (msg.trim() === '') {
         roomsInput.setMessage(roomId, '');
diff --git a/src/client/event/hotkeys.js b/src/client/event/hotkeys.js
index a354724..41c93e9 100644
--- a/src/client/event/hotkeys.js
+++ b/src/client/event/hotkeys.js
@@ -13,7 +13,7 @@ function listenKeyboard(event) {
   }
   if (!event.ctrlKey && !event.altKey) {
     if (navigation.isRawModalVisible) return;
-    if (['input', 'textarea'].includes(document.activeElement.type)) {
+    if (['text', 'textarea'].includes(document.activeElement.type)) {
       return;
     }
     if (event.keyCode < 48