2 files changed, 6 insertions, 1 deletions
diff --git a/src/server_events.c b/src/server_events.c
index c5a3594e..3b2967f7 100644
--- a/src/server_events.c
+++ b/src/server_events.c
@@ -191,7 +191,6 @@ handle_room_message(const char * const room_jid, const char * const nick,
     const char * const message)
 {
     ui_room_message(room_jid, nick, message);
-    ui_current_page_off();
 
     if (prefs_get_boolean(PREF_GRLOG)) {
         Jid *jid = jid_create(jabber_get_fulljid());
diff --git a/src/ui/core.c b/src/ui/core.c
index 4a8a984f..b6032c8e 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -1331,6 +1331,12 @@ _ui_room_message(const char * const room_jid, const char * const nick,
             jid_destroy(jidp);
         }
     }
+
+    ProfWin *current = wins_get_current();
+    if (!current->paged) {
+        win_move_to_end(current);
+        win_refresh(current);
+    }
 }
 
 static void