diff --git a/collects/drracket/private/main.rkt b/collects/drracket/private/main.rkt
index 7b18a41359..3c3b843ceb 100644
--- a/collects/drracket/private/main.rkt
+++ b/collects/drracket/private/main.rkt
@@ -89,10 +89,10 @@
 
 (drracket:modes:add-initial-modes)
 
-(finder:default-filters (list* '("Racket (.rkt)" "*.rkt")
-                               '("Racket (.ss)" "*.ss")
-                               '("Racket (.scm)" "*.scm")
-                               (finder:default-filters)))
+(finder:default-filters
+ `(["Racket Sources" "*.rkt;*.scrbl;*.ss;*.scm"]
+   ,@(finder:default-filters)))
+
 (application:current-app-name (string-constant drscheme))
 
 (drr:set-default 'drracket:language-dialog:hierlist-default #f (λ (x) (or (not x) (and (list? x) (andmap string? x)))))
diff --git a/collects/framework/private/finder.rkt b/collects/framework/private/finder.rkt
index c899505dcc..5136537f57 100644
--- a/collects/framework/private/finder.rkt
+++ b/collects/framework/private/finder.rkt
@@ -25,7 +25,7 @@
               (message-box (string-constant error) msg)
               #f)))))
   
-  (define default-filters (make-parameter '(("Any" "*.*"))))
+  (define default-filters (make-parameter '(["Any" "*.*"])))
   (define default-extension (make-parameter ""))
   
   ;; dialog wrappers
@@ -66,7 +66,8 @@
              [filter #f]
              [filter-msg (string-constant file-wrong-form)]
              [parent-win (dialog-parent-parameter)])
-      (let ([f (get-file prompt parent-win directory #f #f style)])
+      (let ([f (get-file prompt parent-win directory #f
+                         (default-extension) style (default-filters))])
         (and f (or (not filter) (filter-match? filter f filter-msg))
              (let ([f (normalize-path f)])
                (cond [(directory-exists? f)
diff --git a/collects/framework/private/scheme.rkt b/collects/framework/private/scheme.rkt
index 556a96608a..712d03756e 100644
--- a/collects/framework/private/scheme.rkt
+++ b/collects/framework/private/scheme.rkt
@@ -1276,6 +1276,7 @@
     
     (define/override (put-file text sup directory default-name)
       (parameterize ([finder:default-extension "rkt"]
+                     #; ; no need for the following, since it's the default
                      [finder:default-filters '(["Racket Sources" "*.rkt;*.scrbl;*.ss;*.scm"]
                                                ["Any" "*.*"])])
         ;; don't call the surrogate's super, since it sets the default extension