diff --git a/collects/framework/private/main.ss b/collects/framework/private/main.ss
index d6494a6334..bf02b824ef 100644
--- a/collects/framework/private/main.ss
+++ b/collects/framework/private/main.ss
@@ -60,7 +60,9 @@
                            ("case" 1)
                            ("syntax-rules" 1)
                            ("syntax-case" 2)
-                           ("syntax-case*" 3))
+                           ("syntax-case*" 3)
+                           ("kernel-syntax-case" 2)
+                           ("kernel-syntax-case*" 3))
                          (λ (x) (and (list? x) (andmap (λ (x) (and (pair? x)
                                                                    (string? (car x))
                                                                    (pair? (cdr x))
diff --git a/collects/framework/private/scheme.ss b/collects/framework/private/scheme.ss
index 492c2b3340..e22f72fae8 100644
--- a/collects/framework/private/scheme.ss
+++ b/collects/framework/private/scheme.ss
@@ -1662,6 +1662,7 @@
     
     (define-values (ok-button cancel-button)
       (gui-utils:ok/cancel-buttons bp confirm-callback cancel-callback (string-constant ok) (string-constant cancel)))
+    (send tb focus)
     (send f show #t)
     answers)