diff --git a/ChangeLog b/ChangeLog
index 7ef4c9c61..912bc13dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ WeeChat - Wee Enhanced Environment for Chat
 ChangeLog - 2006-06-26
 
 Version 0.2.0 (under dev!):
+   * fixed refresh bug (too many refresh) when terminal is resized
    * case ignored for channel names in charset options (bug #16858)
    * fixed crash when setting look_one_server_buffer to ON (bug #16932)
    * added new functions in plugin/script API: get window info,
diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c
index 38d4852e6..ce99f71d9 100644
--- a/src/gui/curses/gui-curses-chat.c
+++ b/src/gui/curses/gui-curses-chat.c
@@ -888,7 +888,7 @@ gui_chat_draw (t_gui_buffer *buffer, int erase)
     
     for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
     {
-        if (ptr_win->buffer == buffer)
+        if ((ptr_win->buffer == buffer) && (buffer->num_displayed > 0))
         {
             if (erase)
             {
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index 7ef4c9c61..912bc13dc 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -4,6 +4,7 @@ WeeChat - Wee Enhanced Environment for Chat
 ChangeLog - 2006-06-26
 
 Version 0.2.0 (under dev!):
+   * fixed refresh bug (too many refresh) when terminal is resized
    * case ignored for channel names in charset options (bug #16858)
    * fixed crash when setting look_one_server_buffer to ON (bug #16932)
    * added new functions in plugin/script API: get window info,
diff --git a/weechat/src/gui/curses/gui-curses-chat.c b/weechat/src/gui/curses/gui-curses-chat.c
index 38d4852e6..ce99f71d9 100644
--- a/weechat/src/gui/curses/gui-curses-chat.c
+++ b/weechat/src/gui/curses/gui-curses-chat.c
@@ -888,7 +888,7 @@ gui_chat_draw (t_gui_buffer *buffer, int erase)
     
     for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
     {
-        if (ptr_win->buffer == buffer)
+        if ((ptr_win->buffer == buffer) && (buffer->num_displayed > 0))
         {
             if (erase)
             {