diff --git a/PowerEditor/src/NppIO.cpp b/PowerEditor/src/NppIO.cpp
index 505e854fb..51ba2e13f 100644
--- a/PowerEditor/src/NppIO.cpp
+++ b/PowerEditor/src/NppIO.cpp
@@ -1874,7 +1874,6 @@ bool Notepad_plus::fileRename(BufferID id)
 	scnN.nmhdr.code = NPPN_FILEBEFORERENAME;
 	scnN.nmhdr.hwndFrom = _pPublicInterface->getHSelf();
 	scnN.nmhdr.idFrom = (uptr_t)bufferID;
-	_pluginsManager.notify(&scnN);
 
 	bool success = false;
 	bool isFileExisting = PathFileExists(buf->getFullPathName()) != FALSE;
@@ -1893,7 +1892,12 @@ bool Notepad_plus::fileRename(BufferID id)
 		std::wstring fn = fDlg.doSaveDlg();
 
 		if (!fn.empty())
+		{
+			_pluginsManager.notify(&scnN);
 			success = MainFileManager.moveFile(bufferID, fn.c_str());
+			scnN.nmhdr.code = success ? NPPN_FILERENAMED : NPPN_FILERENAMECANCEL;
+			_pluginsManager.notify(&scnN);
+		}
 	}
 	else
 	{
@@ -1941,8 +1945,13 @@ bool Notepad_plus::fileRename(BufferID id)
 			}
 			else
 			{
-				success = true;
+				_pluginsManager.notify(&scnN);
 				buf->setFileName(tabNewNameStr.c_str());
+				scnN.nmhdr.code = NPPN_FILERENAMED;
+				_pluginsManager.notify(&scnN);
+
+				success = true;
+
 				bool isSnapshotMode = NppParameters::getInstance().getNppGUI().isSnapshotMode();
 				if (isSnapshotMode)
 				{
@@ -1963,9 +1972,6 @@ bool Notepad_plus::fileRename(BufferID id)
 		}
 	}
 
-	scnN.nmhdr.code = success ? NPPN_FILERENAMED : NPPN_FILERENAMECANCEL;
-	_pluginsManager.notify(&scnN);
-
 	return success;
 }