diff --git a/collects/framework/private/frame.rkt b/collects/framework/private/frame.rkt
index 66d63e46..4fb8cdae 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 cb22974a..2d18ffba 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)