diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 24fc671e5..1614b2de4 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -15,6 +15,7 @@ For a list of important changes that require manual actions, please look at rele
 
 Bug fixes::
 
+  * core: fix reset to initial scroll position after search of text in buffer (issue #2093)
   * core: add missing mouse events "alt-ctrl-button2" and "alt-ctrl-button3"
   * irc: add missing tags on self action messages when capability echo-message is enabled (issue #2074)
   * python: fix truncation of unsigned long long integer returned by function string_parse_size
diff --git a/src/gui/gui-window.c b/src/gui/gui-window.c
index 1680cccf4..24993d6eb 100644
--- a/src/gui/gui-window.c
+++ b/src/gui/gui-window.c
@@ -1872,13 +1872,13 @@ gui_window_search_stop (struct t_gui_window *window, int stop_here)
 
     if (search == GUI_BUFFER_SEARCH_LINES)
     {
-        window->scroll->text_search_start_line = NULL;
         if (!stop_here)
         {
             window->scroll->start_line = window->scroll->text_search_start_line;
             window->scroll->start_line_pos = 0;
             gui_hotlist_remove_buffer (window->buffer, 0);
         }
+        window->scroll->text_search_start_line = NULL;
         gui_buffer_ask_chat_refresh (window->buffer, 2);
     }
 }