diff --git a/collects/framework/private/editor.rkt b/collects/framework/private/editor.rkt
index 388818e47e..bbe6851a85 100644
--- a/collects/framework/private/editor.rkt
+++ b/collects/framework/private/editor.rkt
@@ -540,7 +540,6 @@
             #t))
       (define/public (backup?) (preferences:get 'framework:backup-files?))
       (define/augment (on-save-file name format)
-        (set! auto-save-error? #f)
         (when (and (backup?)
                    (not (eq? format 'copy))
                    (file-exists? name))
@@ -554,6 +553,10 @@
                   (delete-file back-name))
                 (copy-file name back-name)))))
         (inner (void) on-save-file name format))
+      (define/augment (after-save-file success?)
+        (when success?
+          (set! auto-save-error? #f)))
+
       (define/augment (on-close)
         (remove-autosave)
         (set! do-autosave? #f)
diff --git a/collects/framework/private/text.rkt b/collects/framework/private/text.rkt
index a5b0637ac0..e756a72121 100644
--- a/collects/framework/private/text.rkt
+++ b/collects/framework/private/text.rkt
@@ -1956,7 +1956,7 @@
     (define/public (get-read-write?) read-write?)
     (define/private (check-lock)
       (define filename (get-filename))
-      (define can-edit? 
+      (define can-edit?
         (if (and filename
                  (file-exists? filename))
             (and (member 'write