diff --git a/src/gui/curses/gui-display.c b/src/gui/curses/gui-display.c
index 651d6a3e1..f9832e3ac 100644
--- a/src/gui/curses/gui-display.c
+++ b/src/gui/curses/gui-display.c
@@ -1675,7 +1675,11 @@ gui_draw_buffer_chat (t_gui_buffer *buffer, int erase)
                 if (!ptr_line && ptr_win->scroll)
                 {
                     if (count == gui_display_line (ptr_win, ptr_win->buffer->last_line, 0, 1))
+                    {
                         ptr_win->scroll = 0;
+                        ptr_win->start_line = NULL;
+                        ptr_win->start_line_pos = 0;
+                    }
                 }
                 
                 if (!ptr_win->scroll && (ptr_win->start_line == ptr_win->buffer->lines))
diff --git a/weechat/src/gui/curses/gui-display.c b/weechat/src/gui/curses/gui-display.c
index 651d6a3e1..f9832e3ac 100644
--- a/weechat/src/gui/curses/gui-display.c
+++ b/weechat/src/gui/curses/gui-display.c
@@ -1675,7 +1675,11 @@ gui_draw_buffer_chat (t_gui_buffer *buffer, int erase)
                 if (!ptr_line && ptr_win->scroll)
                 {
                     if (count == gui_display_line (ptr_win, ptr_win->buffer->last_line, 0, 1))
+                    {
                         ptr_win->scroll = 0;
+                        ptr_win->start_line = NULL;
+                        ptr_win->start_line_pos = 0;
+                    }
                 }
                 
                 if (!ptr_win->scroll && (ptr_win->start_line == ptr_win->buffer->lines))