diff --git a/collects/framework/private/frame.ss b/collects/framework/private/frame.ss
index 4f4e5d5d..5ceccac3 100644
--- a/collects/framework/private/frame.ss
+++ b/collects/framework/private/frame.ss
@@ -254,8 +254,8 @@
                 (when (null? (send (group:get-the-frame-group) get-frames))
                   (exit:exit)))))
           
-          (define/override (on-focus on?)
-            (super on-focus on?)
+          (define/override (on-activate on?)
+            (super on-activate on?)
             (when on?
               (send (group:get-the-frame-group) set-active-frame this)))
           
diff --git a/collects/framework/private/group.ss b/collects/framework/private/group.ss
index 586440ca..b734c8e1 100644
--- a/collects/framework/private/group.ss
+++ b/collects/framework/private/group.ss
@@ -178,18 +178,16 @@
               (set! todo-to-new-frames
                     (let ([old todo-to-new-frames])
                       (λ (frame) (old frame) (f frame)))))]
-          [define get-active-frame
-            (λ ()
-              (cond
-                [active-frame active-frame]
-                [(null? frames) #f]
-                [else (frame-frame (car frames))]))]
-          [define set-active-frame
-            (λ (f)
-              (when (and active-frame
-                         (not (eq? active-frame f)))
-                (set! most-recent-window-box (make-weak-box active-frame)))
-              (set! active-frame f))]
+          (define (get-active-frame)
+            (cond
+              [active-frame active-frame]
+              [(null? frames) #f]
+              [else (frame-frame (car frames))]))
+          (define (set-active-frame f)
+            (when (and active-frame
+                       (not (eq? active-frame f)))
+              (set! most-recent-window-box (make-weak-box active-frame)))
+            (set! active-frame f))
           [define insert-frame
             (λ (new-frame)
               (unless (memf (λ (fr) (eq? (frame-frame fr) new-frame))