diff --git a/collects/framework/private/frame.rkt b/collects/framework/private/frame.rkt
index 66d63e465b..4fb8cdae21 100644
--- a/collects/framework/private/frame.rkt
+++ b/collects/framework/private/frame.rkt
@@ -761,7 +761,7 @@
         (let-values ([(cw _4) (get-client-size)]
                      [(tw _1 _2 _3) (send dc get-text-extent str normal-control-font)])
           (when (< cw tw)
-            (min-client-width (inexact->exact (floor tw)))))))
+            (min-client-width (inexact->exact (ceiling tw)))))))
     (define/override (on-paint)
       (let ([dc (get-dc)])
         (send dc set-font normal-control-font)
diff --git a/collects/framework/private/preferences.rkt b/collects/framework/private/preferences.rkt
index cb22974a2d..2d18ffba34 100644
--- a/collects/framework/private/preferences.rkt
+++ b/collects/framework/private/preferences.rkt
@@ -295,7 +295,9 @@ the state transitions / contracts are:
       (gui-utils:ok/cancel-buttons
        bottom-panel
        ok-callback
-       (λ (a b) (cancel-callback)))
+       (λ (a b) (cancel-callback))
+       (string-constant ok)
+       (string-constant undo-changes))
       (make-object grow-box-spacer-pane% bottom-panel)
       (send* bottom-panel
         (stretchable-height #f)
diff --git a/collects/string-constants/english-string-constants.rkt b/collects/string-constants/english-string-constants.rkt
index 84daa5f704..68a6bf0569 100644
--- a/collects/string-constants/english-string-constants.rkt
+++ b/collects/string-constants/english-string-constants.rkt
@@ -455,6 +455,7 @@ please adhere to these guidelines:
  (default-text-color "Default text") ;; used for configuring colors, but doesn't need the word "color"
  (choose-a-background-color "Please choose a background color")
  (revert-to-defaults "Revert to Defaults")
+ (undo-changes "Undo Changes and Close") ;; used in the preferences dialog to undo preference changes
   
   (black-on-white-color-scheme "Black on White") ;; these two appear in the color preferences dialog on butttons
   (white-on-black-color-scheme "White on Black") ;; clicking the buttons changes the color schemes to some defaults that've been set up.