Index: base/applications/notepad/settings.c
===================================================================
--- base/applications/notepad/settings.c	(revision 46870)
+++ base/applications/notepad/settings.c	(working copy)
@@ -116,6 +116,11 @@
 	dy = dx * 3 / 4;
 	SetRect( &Globals.main_rect, 0, 0, dx, dy );
 
+	/* Set default font face name.  This prevents the font from changing
+	 * between the first execution of Notepad and subsequent executions as
+	 * detailed in bug 3970 */
+	lstrcpyn(Globals.lfFont.lfFaceName, DEFAULT_FONT_FACE_NAME, sizeof(Globals.lfFont.lfFaceName) / sizeof(Globals.lfFont.lfFaceName[0]));
+
 	if (RegOpenKey(HKEY_CURRENT_USER, s_szRegistryKey, &hKey) == ERROR_SUCCESS)
 	{
 		QueryByte(hKey,     _T("lfCharSet"),        &Globals.lfFont.lfCharSet);
Index: base/applications/notepad/main.h
===================================================================
--- base/applications/notepad/main.h	(revision 46870)
+++ base/applications/notepad/main.h	(working copy)
@@ -39,6 +39,8 @@
 #define EOLN_LF             1
 #define EOLN_CR             2
 
+#define DEFAULT_FONT_FACE_NAME	_T("Courier New")
+
 typedef struct
 {
   HINSTANCE  hInstance;