diff --git a/reactos/base/applications/notepad/dialog.c b/reactos/base/applications/notepad/dialog.c
index 3153c804c0a..9d7b979b331 100644
--- a/reactos/base/applications/notepad/dialog.c
+++ b/reactos/base/applications/notepad/dialog.c
@@ -983,6 +983,11 @@ VOID DoCreateEditWindow(VOID)
 
     if (Globals.hEdit == NULL)
     {
+        if (pTemp)
+        {
+            HeapFree(GetProcessHeap(), 0, pTemp);
+        }
+
         ShowLastError();
         return;
     }
diff --git a/reactos/base/applications/notepad/main.c b/reactos/base/applications/notepad/main.c
index 0c1dc562b14..fa8e8850830 100644
--- a/reactos/base/applications/notepad/main.c
+++ b/reactos/base/applications/notepad/main.c
@@ -24,6 +24,8 @@
 
 #include "notepad.h"
 
+#include <strsafe.h>
+
 NOTEPAD_GLOBALS Globals;
 static ATOM aFINDMSGSTRING;
 
@@ -43,7 +45,7 @@ VOID NOTEPAD_EnableSearchMenu()
  */
 VOID SetFileName(LPCTSTR szFileName)
 {
-    _tcscpy(Globals.szFileName, szFileName);
+    StringCchCopy(Globals.szFileName, SIZEOF(Globals.szFileName), szFileName);
     Globals.szFileTitle[0] = 0;
     GetFileTitle(szFileName, Globals.szFileTitle, SIZEOF(Globals.szFileTitle));
 }