1 files changed, 9 insertions, 8 deletions

diff --git a/source/blender/editors/interface/interface_region_search.cc b/source/blender/editors/interface/interface_region_search.cc
index 64de31dfe6a..6bb47666afd 100644
--- a/source/blender/editors/interface/interface_region_search.cc
+++ b/source/blender/editors/interface/interface_region_search.cc
@@ -41,7 +41,7 @@
 
 #include "GPU_state.h"
 #include "interface_intern.h"
-#include "interface_regions_intern.h"
+#include "interface_regions_intern.hh"
 
 #define MENU_BORDER (int)(0.3f * U.widget_unit)
 
@@ -451,15 +451,16 @@ void ui_searchbox_update(bContext *C, ARegion *region, uiBut *but, const bool re
   /* reset vars */
   data->items.totitem = 0;
   data->items.more = 0;
-  if (reset == false) {
+  if (!reset) {
     data->items.offset_i = data->items.offset;
   }
   else {
     data->items.offset_i = data->items.offset = 0;
     data->active = -1;
 
-    /* handle active */
-    if (search_but->items_update_fn && search_but->item_active) {
+    /* On init, find and center active item. */
+    const bool is_first_search = !search_but->but.changed;
+    if (is_first_search && search_but->items_update_fn && search_but->item_active) {
       data->items.active = search_but->item_active;
       ui_searchbox_update_fn(C, search_but, but->editstr, &data->items);
       data->items.active = nullptr;
@@ -709,18 +710,18 @@ static ARegion *ui_searchbox_create_generic_ex(bContext *C,
   type.regionid = RGN_TYPE_TEMPORARY;
   region->type = &type;
 
-  /* create searchbox data */
+  /* Create search-box data. */
   uiSearchboxData *data = MEM_cnew<uiSearchboxData>(__func__);
 
-  /* set font, get bb */
+  /* Set font, get the bounding-box. */
   data->fstyle = style->widget; /* copy struct */
   ui_fontscale(&data->fstyle.points, aspect);
   UI_fontstyle_set(&data->fstyle);
 
   region->regiondata = data;
 
-  /* special case, hardcoded feature, not draw backdrop when called from menus,
-   * assume for design that popup already added it */
+  /* Special case, hard-coded feature, not draw backdrop when called from menus,
+   * assume for design that popup already added it. */
   if (but->block->flag & UI_BLOCK_SEARCH_MENU) {
     data->noback = true;
   }