diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c
index c8b77bd7555..c982791b35c 100644
--- a/programs/regedit/edit.c
+++ b/programs/regedit/edit.c
@@ -151,6 +151,7 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara
         else
             SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, g_pszDefaultValueName);
         SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_SETDATA, (WPARAM)params->cbData, (LPARAM)params->pData);
+        SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, WM_SETFONT, (WPARAM) GetStockObject(ANSI_FIXED_FONT), TRUE);
         return TRUE;
     case WM_COMMAND:
         switch (LOWORD(wParam)) {
diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c
index fc6c3a3b082..46d9b82ffdc 100644
--- a/programs/regedit/hexedit.c
+++ b/programs/regedit/hexedit.c
@@ -329,16 +329,6 @@ HexEdit_Char (HEXEDIT_INFO *infoPtr, WCHAR ch)
     return 0;
 }
 
-static inline LRESULT
-HexEdit_Create (HEXEDIT_INFO *infoPtr, LPCREATESTRUCTW lpcs)
-{
-    HexEdit_SetFont(infoPtr, GetStockObject(SYSTEM_FONT), FALSE);
-    HexEdit_UpdateScrollbars(infoPtr);
-
-    return 0;
-}
-
-
 static inline LRESULT
 HexEdit_Destroy (HEXEDIT_INFO *infoPtr)
 {
@@ -630,9 +620,6 @@ HexEdit_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 	case WM_CHAR:
 	    return HexEdit_Char (infoPtr, (WCHAR)wParam);
 
-	case WM_CREATE:
-	    return HexEdit_Create (infoPtr, (LPCREATESTRUCTW)lParam);
-
 	case WM_DESTROY:
 	    return HexEdit_Destroy (infoPtr);