diff --git a/scene/gui/option_button.cpp b/scene/gui/option_button.cpp
index e7de0f09128..5780cc5e713 100644
--- a/scene/gui/option_button.cpp
+++ b/scene/gui/option_button.cpp
@@ -334,9 +334,6 @@ OptionButton::OptionButton() {
 	popup = memnew(PopupMenu);
 	popup->hide();
 	add_child(popup);
-	//	popup->set_pass_on_modal_close_click(false);
-	//	popup->set_notify_transform(true);
-	popup->set_allow_search(true);
 	popup->connect("index_pressed", callable_mp(this, &OptionButton::_selected));
 	popup->connect("id_focused", callable_mp(this, &OptionButton::_focused));
 	popup->connect("popup_hide", callable_mp((BaseButton *)this, &BaseButton::set_pressed), varray(false));
diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp
index b439d859837..6e19b820e0c 100644
--- a/scene/gui/popup_menu.cpp
+++ b/scene/gui/popup_menu.cpp
@@ -1442,7 +1442,7 @@ PopupMenu::PopupMenu() {
 	during_grabbed_click = false;
 	invalidated_click = false;
 
-	allow_search = false;
+	allow_search = true;
 	search_time_msec = 0;
 	search_string = "";