diff --git a/src/gui/gui-common.c b/src/gui/gui-common.c
index 5f67d2ce7..7fb21db58 100644
--- a/src/gui/gui-common.c
+++ b/src/gui/gui-common.c
@@ -1543,6 +1543,10 @@ gui_buffer_move_to_number (t_gui_window *window, int number)
     t_gui_buffer *ptr_buffer;
     int i;
     
+    /* if only one buffer then return */
+    if (gui_buffers == last_gui_buffer)
+        return;
+    
     /* buffer number is already ok ? */
     if (number == window->buffer->number)
         return;
diff --git a/weechat/src/gui/gui-common.c b/weechat/src/gui/gui-common.c
index 5f67d2ce7..7fb21db58 100644
--- a/weechat/src/gui/gui-common.c
+++ b/weechat/src/gui/gui-common.c
@@ -1543,6 +1543,10 @@ gui_buffer_move_to_number (t_gui_window *window, int number)
     t_gui_buffer *ptr_buffer;
     int i;
     
+    /* if only one buffer then return */
+    if (gui_buffers == last_gui_buffer)
+        return;
+    
     /* buffer number is already ok ? */
     if (number == window->buffer->number)
         return;