diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 3bd3175b4..a7b38be0d 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -41,6 +41,9 @@
 	* src/ArgHandler.py (auto_save_load): Subclass database depending 
 	on the format.
 
+	* src/DbPrompter.py (ExistingDbPrompter.chooser,
+	ImportDbPrompter.chooser): Destroy file chooser on failure (#1014254).
+
 2004-08-23  Tim Waugh  <twaugh@redhat.com>
 	* install-sh: Removed this generated file.
 
diff --git a/gramps2/src/DbPrompter.py b/gramps2/src/DbPrompter.py
index 8a6c9984e..e86304328 100644
--- a/gramps2/src/DbPrompter.py
+++ b/gramps2/src/DbPrompter.py
@@ -213,11 +213,8 @@ class ExistingDbPrompter:
                         return 0
             QuestionDialog.ErrorDialog( _("Could not open file: %s") % filename,
                         _('The type "%s" is not in the list of known file types') % filetype )
-            return 0
-
-        else:
-            choose.destroy()
-            return 0
+        choose.destroy()
+        return 0
 
 #-------------------------------------------------------------------------
 #
@@ -301,11 +298,8 @@ class ImportDbPrompter:
                     return 1
             QuestionDialog.ErrorDialog( _("Could not open file: %s") % filename,
                         _('The type "%s" is not in the list of known file types') % filetype )
-            return 0
-
-        else:
-            choose.destroy()
-            return 0
+        choose.destroy()
+        return 0
 
 #-------------------------------------------------------------------------
 #