diff --git a/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
index fb7a9fc12c85..84246b11b057 100644
--- a/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
+++ b/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
@@ -5633,6 +5633,12 @@ intptr_t CALLBACK Finder::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam
 	{
 		case WM_COMMAND :
 		{
+			if (HIWORD(wParam) == SCEN_SETFOCUS)
+			{
+				::SendMessage(_hParent, NPPM_INTERNAL_CHECKUNDOREDOSTATE, 0, 0);
+				return TRUE;
+			}
+
 			switch (wParam)
 			{
 				case NPPM_INTERNAL_FINDINFINDERDLG: