diff --git a/PowerEditor/src/NppBigSwitch.cpp b/PowerEditor/src/NppBigSwitch.cpp
index d2041bfa..cde924af 100644
--- a/PowerEditor/src/NppBigSwitch.cpp
+++ b/PowerEditor/src/NppBigSwitch.cpp
@@ -214,7 +214,7 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa
 		}
 		case NPPM_LAUNCHFINDINFILESDLG :
 		{
-/*
+			// Find in files function code should be here due to the number of parameters (2) cannot be passed via WM_COMMAND
 			const int strSize = FINDREPLACE_MAXLENGTH;
 			TCHAR str[strSize];
 
@@ -228,9 +228,6 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa
 			_findReplaceDlg.launchFindInFilesDlg();
 			setFindReplaceFolderFilter((const TCHAR*) wParam, (const TCHAR*) lParam);
 			return TRUE;
-*/
-			return ::SendMessage(_pPublicInterface->getHSelf(), WM_COMMAND, IDM_SEARCH_FINDINFILES, 0);
-			
 		}
 
 		case NPPM_DOOPEN:
diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp
index 6825224d..1cdcd3be 100644
--- a/PowerEditor/src/NppCommands.cpp
+++ b/PowerEditor/src/NppCommands.cpp
@@ -612,7 +612,6 @@ void Notepad_plus::command(int id)
 
 		case IDM_SEARCH_FIND :
 		case IDM_SEARCH_REPLACE :
-		case IDM_SEARCH_FINDINFILES:
 		case IDM_SEARCH_MARK :
 		{
 			const int strSize = FINDREPLACE_MAXLENGTH;
@@ -623,8 +622,6 @@ void Notepad_plus::command(int id)
 			DIALOG_TYPE dlgID = FIND_DLG;
 			if (id == IDM_SEARCH_REPLACE)
 				dlgID = REPLACE_DLG;
-			else if (id == IDM_SEARCH_FINDINFILES)
-				dlgID = FINDINFILES_DLG;
 			else if (id == IDM_SEARCH_MARK)
 				dlgID = MARK_DLG;
 			_findReplaceDlg.doDialog(dlgID, _nativeLangSpeaker.isRTL());
@@ -638,13 +635,12 @@ void Notepad_plus::command(int id)
 			break;
 		}
 
-		/*
 		case IDM_SEARCH_FINDINFILES:
 		{
 			::SendMessage(_pPublicInterface->getHSelf(), NPPM_LAUNCHFINDINFILESDLG, 0, 0);
 			break;
 		}
-		*/
+
 		case IDM_SEARCH_FINDINCREMENT :
 		{
 			const int strSize = FINDREPLACE_MAXLENGTH;