diff --git a/ChangeLog b/ChangeLog
index 21d4fcb9c..57b931ff7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,11 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2008-01-24
+ChangeLog - 2008-01-28
 
 
 Version 0.2.7 (under dev!):
+   * fixed bug when switching window, scrollback is now preserved (task #7680)
    * added group support in nicklist
    * added backlog option in logger plugin
    * improved main loop: higher timout in select(), less CPU usage
diff --git a/src/gui/gui-window.c b/src/gui/gui-window.c
index a07329d82..f2ee25a40 100644
--- a/src/gui/gui-window.c
+++ b/src/gui/gui-window.c
@@ -381,7 +381,6 @@ gui_window_switch_previous (struct t_gui_window *window)
         return;
     
     gui_current_window = (window->prev_window) ? window->prev_window : last_gui_window;
-    gui_window_switch_to_buffer (gui_current_window, gui_current_window->buffer);
     gui_window_redraw_buffer (gui_current_window->buffer);
 }
 
@@ -400,7 +399,6 @@ gui_window_switch_next (struct t_gui_window *window)
         return;
     
     gui_current_window = (window->next_window) ? window->next_window : gui_windows;
-    gui_window_switch_to_buffer (gui_current_window, gui_current_window->buffer);
     gui_window_redraw_buffer (gui_current_window->buffer);
 }
 
@@ -422,7 +420,6 @@ gui_window_switch_by_buffer (struct t_gui_window *window, int buffer_number)
         if (ptr_win->buffer->number == buffer_number)
         {
             gui_current_window = ptr_win;
-            gui_window_switch_to_buffer (gui_current_window, gui_current_window->buffer);
             gui_window_redraw_buffer (gui_current_window->buffer);
             return;
         }