diff --git a/collects/framework/finder.ss b/collects/framework/finder.ss
index 893e4809..e351aef2 100644
--- a/collects/framework/finder.ss
+++ b/collects/framework/finder.ss
@@ -542,7 +542,6 @@
 	[ok-button
 	 (make-object button% "OK" bottom-panel do-ok '(border))])
       (sequence
-        (printf "start-dir: ~s~n" start-dir)
 	(cond
 	  [(and start-dir
 		(directory-exists? start-dir))
@@ -720,7 +719,6 @@
   
   (define -get-file
     (lambda args
-      (printf "get-file: ~s~n" args)
       (let ([actual-fun
 	     (case (preferences:get 'framework:file-dialogs)
 	       [(std) std-get-file]
diff --git a/collects/framework/frame.ss b/collects/framework/frame.ss
index 4463e881..69646ad3 100644
--- a/collects/framework/frame.ss
+++ b/collects/framework/frame.ss
@@ -488,7 +488,7 @@
     (set! searching-frame frame))
 
   (define find-text%
-    (class-asi text%
+    (class-asi text:keymap%
       (inherit get-text)
       (rename [super-after-insert after-insert]
 	      [super-after-delete after-delete]
@@ -496,7 +496,8 @@
       (private
 	[get-searching-edit
 	 (lambda ()
-	   (send searching-frame get-text-to-search))])
+           (and searching-frame
+                (send searching-frame get-text-to-search)))])
       (public
 	[search
 	 (opt-lambda ([reset-search-anchor? #t] [beep? #t] [wrap? #t])
@@ -557,7 +558,9 @@
 	[on-focus
 	 (lambda (on?)
 	   (when on?
-	     (reset-search-anchor (get-searching-edit)))
+             (let ([edit (get-searching-edit)])
+               (when edit
+                 (reset-search-anchor (get-searching-edit)))))
 	   (super-on-focus on?))]
 	[after-insert
 	 (lambda args
@@ -588,7 +591,7 @@
   (define (init-find/replace-edits)
     (unless find-edit
       (set! find-edit (make-object find-text%))
-      (set! replace-edit (make-object text%))
+      (set! replace-edit (make-object text:keymap%))
       (for-each (lambda (keymap)
 		  (send keymap chain-to-keymap
 			(keymap:get-search)
@@ -632,7 +635,9 @@
 	   (get-editor))]
 	[hide-search
 	 (opt-lambda ([startup? #f])
-	   (send super-root delete-child search-panel)
+	   (send super-root change-children
+                 (lambda (l)
+                   (mzlib:function:remove search-panel l)))
 	   (clear-search-highlight)
 	   (unless startup?
 	     (send 
@@ -827,10 +832,6 @@
 	     (set! rest-panel r-root)
 	     r-root))])
       
-      (override
-        [get-editor<%> (lambda () editor:info<%>)]
-        [get-editor% (lambda () text:info%)])
-
       (public
 	[determine-width
 	 (let ([magic-space 25])
@@ -988,6 +989,11 @@
 	   (lambda ()
 	     (one)
 	     (two)))])
+      
+      (override
+        [get-editor<%> (lambda () editor:info<%>)]
+        [get-editor% (lambda () text:info%)])
+
       (override
 	[on-close
 	 (lambda ()
diff --git a/collects/framework/keymap.ss b/collects/framework/keymap.ss
index aa6b2472..a45f6562 100644
--- a/collects/framework/keymap.ss
+++ b/collects/framework/keymap.ss
@@ -792,7 +792,7 @@
 	     (map "d:f" "move-to-search-or-search")
 	     (map "d:r" "move-to-search-or-reverse-search")
 	     (map "d:g" "find-string")
-	     (map "d:o" "toggle-search-focus")])))))
+	     (map "c:i" "toggle-search-focus")])))))
   
   (define setup-file
     (let* ([save-file-as
diff --git a/collects/framework/prefs.ss b/collects/framework/prefs.ss
index 29300578..58f96b4c 100644
--- a/collects/framework/prefs.ss
+++ b/collects/framework/prefs.ss
@@ -288,7 +288,7 @@
 	       (add-callback 
 		name 
 		(lambda (p new-value)
-		  '(write-resource 
+		  (write-resource 
 		   font-section
 		   font-entry
 		   (if (and (string? new-value)
diff --git a/collects/tests/framework/frame.ss b/collects/tests/framework/frame.ss
index 97f7c47e..f724d092 100644
--- a/collects/tests/framework/frame.ss
+++ b/collects/tests/framework/frame.ss
@@ -129,6 +129,6 @@
 	 `(send (get-top-level-focus-window) close)))))))
 
 (test-open "frame:editor open" 'frame:text%)
-(test-open "frame:editor open" 'frame:searchable%)
-(test-open "frame:editor open" 'frame:text-info%)
-(test-open "frame:editor open" 'frame:text-info-file%)
+(test-open "frame:searchable open" 'frame:searchable%)
+(test-open "frame:text-info open" 'frame:text-info%)
+(test-open "frame:text-info-file open" 'frame:text-info-file%)