diff --git a/collects/framework/private/frame.ss b/collects/framework/private/frame.ss
index 198b4c13..6613c0f0 100644
--- a/collects/framework/private/frame.ss
+++ b/collects/framework/private/frame.ss
@@ -2147,10 +2147,15 @@
             (λ ()
               (set-searching-frame this)
               (unhide-search)
-              (if (or (send find-canvas has-focus?)
-                      (send replace-canvas has-focus?))
-                  (search-again 'backward)
-                  (send find-canvas focus))))
+              (cond
+                [(preferences:get 'framework:search-using-dialog?)
+                 (search-again 'backward)
+                 (set-searching-direction 'forward)]
+                [else
+		 (if (or (send find-canvas has-focus?)
+                         (send replace-canvas has-focus?))
+                     (search-again 'backward)
+                     (send find-canvas focus))])))
           (define search-again
             (opt-lambda ([direction searching-direction] [beep? #t])
               (set-searching-frame this)
diff --git a/collects/framework/private/keymap.ss b/collects/framework/private/keymap.ss
index c95c3f58..7597a31e 100644
--- a/collects/framework/private/keymap.ss
+++ b/collects/framework/private/keymap.ss
@@ -1216,7 +1216,7 @@
 		 ;; covered by menu
                  ;(map "d:f" "move-to-search-or-search")
                  
-		 (map "d:r" "move-to-search-or-reverse-search")
+		 (map "c:r" "move-to-search-or-reverse-search")
 		 (map "d:g" "find-string-again")
 		 (map "c:i" "toggle-search-focus")])))))