diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 94cf00190a..8ec0087a81 100644
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -198,8 +198,8 @@ bool wxDialog::Create(wxWindow *parent,
 
     if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
         return FALSE;
-
-    SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
+    if (!m_hasFont)
+        SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
     return TRUE;
 }