diff --git a/ChangeLog b/ChangeLog
index da6de9d4c..6ff3351ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,14 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.4.0-dev, 2012-10-17
+v0.4.0-dev, 2012-10-18
 
 
 Version 0.4.0 (under dev!)
 --------------------------
 
+* core: fix display of zoomed/merged buffer (with number >= 2) after switching
+  to it (bug #37593)
 * core: fix display problem when option weechat.look.prefix_same_nick is set
   (problem with nick displayed in first line of screen) (bug #37556)
 * core: fix wrapping of words with wide chars (the break was made before the
diff --git a/src/gui/gui-buffer.c b/src/gui/gui-buffer.c
index 409e81c6a..05cb8aa77 100644
--- a/src/gui/gui-buffer.c
+++ b/src/gui/gui-buffer.c
@@ -2303,7 +2303,7 @@ gui_buffer_set_active_buffer (struct t_gui_buffer *buffer)
     for (ptr_buffer = gui_buffers; ptr_buffer;
          ptr_buffer = ptr_buffer->next_buffer)
     {
-        if (ptr_buffer->active)
+        if ((ptr_buffer->number == buffer->number) && (ptr_buffer->active))
         {
             active = ptr_buffer->active;
             break;