diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index e6c395a14..e33b4ab65 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -2,6 +2,8 @@
 	* src/plugins/WebPage.py (WebReportOptions.set_new_options):
 	Define help dictionary to document options.
 	* src/Report.py (CommandLineReport.init_options): Typo.
+	* src/Report.py (ReportDialog.on_ok_clicked): Properly return on
+	correct/change filename choice.
 
 2005-07-27  Don Allingham  <don@gramps-project.org>
 	* src/plugins/NavWebPage.py: add user html header and footer
diff --git a/gramps2/src/Report.py b/gramps2/src/Report.py
index 3f21c0dbe..4fcbe5a14 100644
--- a/gramps2/src/Report.py
+++ b/gramps2/src/Report.py
@@ -1334,7 +1334,7 @@ class ReportDialog(BareReportDialog):
                              _('_Change filename'),None)
                              
             if a.get_response() == gtk.RESPONSE_YES:
-                return
+                return None
         
         self.set_default_directory(os.path.dirname(self.target_path) + os.sep)
         self.options.handler.output = self.target_path
@@ -1408,7 +1408,7 @@ class ReportDialog(BareReportDialog):
 
         # Is there a filename?  This should also test file permissions, etc.
         if not self.parse_target_frame():
-            return
+            self.window.run()
 
         # Preparation
         self.parse_format_frame()