diff --git a/src/auto4_lua_dialog.cpp b/src/auto4_lua_dialog.cpp
index 7deee7a74..c4c1edb3b 100644
--- a/src/auto4_lua_dialog.cpp
+++ b/src/auto4_lua_dialog.cpp
@@ -180,6 +180,7 @@ namespace Automation4 {
 
 			wxControl *Create(wxWindow *parent) override {
 				cw = new wxTextCtrl(parent, -1, to_wx(text));
+				cw->SetMaxLength(0);
 				cw->SetValidator(StringBinder(&text));
 				cw->SetToolTip(to_wx(hint));
 				return cw;
diff --git a/src/dialog_search_replace.cpp b/src/dialog_search_replace.cpp
index 4470f8bd2..e5da08b73 100644
--- a/src/dialog_search_replace.cpp
+++ b/src/dialog_search_replace.cpp
@@ -63,11 +63,13 @@ DialogSearchReplace::DialogSearchReplace(agi::Context* c, bool replace)
 
 	auto find_sizer = new wxFlexGridSizer(2, 2, 5, 15);
 	find_edit = new wxComboBox(this, -1, "", wxDefaultPosition, wxSize(300, -1), recent_find, wxCB_DROPDOWN, StringBinder(&settings->find));
+	find_edit->SetMaxLength(0);
 	find_sizer->Add(new wxStaticText(this, -1, _("Find what:")), wxSizerFlags().Center().Left());
 	find_sizer->Add(find_edit);
 
 	if (has_replace) {
 		replace_edit = new wxComboBox(this, -1, "", wxDefaultPosition, wxSize(300, -1), lagi_MRU_wxAS("Replace"), wxCB_DROPDOWN, StringBinder(&settings->replace_with));
+		replace_edit->SetMaxLength(0);
 		find_sizer->Add(new wxStaticText(this, -1, _("Replace with:")), wxSizerFlags().Center().Left());
 		find_sizer->Add(replace_edit);
 	}