diff --git a/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
index db26aaaa2..0caf3dfa4 100644
--- a/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
+++ b/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
@@ -2244,6 +2244,11 @@ intptr_t CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARA
 							findAllIn(FILES_IN_DIR);
 							nppParamInst._isFindReplacing = false;
 						}
+						else
+						{
+							// move input focus to "Directory:" edit control
+							::SendMessage(_hSelf, WM_NEXTDLGCTL, reinterpret_cast<WPARAM>(::GetDlgItem(_hSelf, IDD_FINDINFILES_DIR_COMBO)), TRUE);
+						}
 					}
 					else if (_currentStatus == FINDINPROJECTS_DLG)
 					{
@@ -2296,6 +2301,11 @@ intptr_t CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARA
 							nppParamInst._isFindReplacing = false;
 						}
 					}
+					else
+					{
+						// move input focus to "Directory:" edit control
+						::SendMessage(_hSelf, WM_NEXTDLGCTL, reinterpret_cast<WPARAM>(::GetDlgItem(_hSelf, IDD_FINDINFILES_DIR_COMBO)), TRUE);
+					}
 				}
 				return TRUE;