diff --git a/collects/mred/private/wx/win32/window.rkt b/collects/mred/private/wx/win32/window.rkt
index caca412b..3ca1072c 100644
--- a/collects/mred/private/wx/win32/window.rkt
+++ b/collects/mred/private/wx/win32/window.rkt
@@ -322,7 +322,7 @@
               [dc (make-object bitmap-dc% bm)])
          (set! measure-dc dc)))
      (send measure-dc set-font (or font
-                                   (make-object font% 8 'system)))
+				   (get-default-control-font)))
      (let-values ([(w h d a) (let loop ([label label])
                                (cond
                                 [(null? label) (values 0 0 0 0)]
@@ -689,6 +689,18 @@
 
 ;; ----------------------------------------
 
+(define default-control-font #f)
+(define (get-default-control-font)
+  (unless default-control-font
+    (set! default-control-font
+	  (make-object font%
+		       (get-theme-font-size)
+		       (get-theme-font-face)
+		       'system
+		       'normal 'normal #f 'default
+		       #t)))
+  default-control-font)
+
 (define (queue-window-event win thunk)
   (queue-event (send win get-eventspace) thunk))