diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 86cc51712a9..3da208fb789 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -2061,7 +2061,12 @@ static void ui_but_drop(bContext *C, const wmEvent *event, uiBut *but, uiHandleB
 					ui_searchbox_update(C, data->searchbox, but, true);
 				}
 
+				bool free_search_arg = but->free_search_arg;
+				but->free_search_arg = false;
+
 				button_activate_state(C, but, BUTTON_STATE_EXIT);
+
+				but->free_search_arg = free_search_arg;
 			}
 		}
 	}