diff --git a/src/gui/curses/gui-input.c b/src/gui/curses/gui-input.c
index 723b2601a..8a501df02 100644
--- a/src/gui/curses/gui-input.c
+++ b/src/gui/curses/gui-input.c
@@ -370,6 +370,7 @@ gui_read_keyb ()
                                 hotlist_free_all ();
                                 gui_redraw_buffer (gui_current_window->buffer);
                             }
+                            hotlist_initial_buffer = gui_current_window->buffer;
                             break;
                     }
                 }
diff --git a/weechat/src/gui/curses/gui-input.c b/weechat/src/gui/curses/gui-input.c
index 723b2601a..8a501df02 100644
--- a/weechat/src/gui/curses/gui-input.c
+++ b/weechat/src/gui/curses/gui-input.c
@@ -370,6 +370,7 @@ gui_read_keyb ()
                                 hotlist_free_all ();
                                 gui_redraw_buffer (gui_current_window->buffer);
                             }
+                            hotlist_initial_buffer = gui_current_window->buffer;
                             break;
                     }
                 }