diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c
index f69773e3b04..ca2711c8513 100644
--- a/base/applications/notepad/dialog.c
+++ b/base/applications/notepad/dialog.c
@@ -305,6 +305,12 @@ static BOOL DoSaveFile(VOID)
 
     CloseHandle(hFile);
     HeapFree(GetProcessHeap(), 0, pTemp);
+
+    if (bRet)
+    {
+        SetFileName(Globals.szFileName);
+    }
+
     return bRet;
 }