diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 2cacf725b..d534a7b14 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -11,6 +11,10 @@
 	* src/Exporter.py (native_export): Use real export.
 	* src/WriteGrdb.py (exportData): Provide default cl value.
 
+	* src/gramps_main.py (on_new_clicked): Do not prematurely close db.
+	* src/DbPrompter.py (NewNativeDbPrompter.chooser): Close old db
+	if positively opening a new one.
+
 2005-02-21  Don Allingham  <dallingham@users.sourceforge.net>
 	* Release: Version 1.1.90 "Successful encyclopedia salesman" released.
 
diff --git a/gramps2/src/DbPrompter.py b/gramps2/src/DbPrompter.py
index 0358dfb9d..1b90156e4 100644
--- a/gramps2/src/DbPrompter.py
+++ b/gramps2/src/DbPrompter.py
@@ -365,6 +365,7 @@ class NewNativeDbPrompter:
                 if os.path.splitext(filename)[1] != ".grdb":
                     filename = filename + ".grdb"
                 choose.destroy()
+                self.parent.db.close()
                 self.parent.db = GrampsBSDDB.GrampsBSDDB()
                 self.parent.read_file(filename)
                 # Add the file to the recent items
diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py
index 90d5acb56..7c4dc1c31 100755
--- a/gramps2/src/gramps_main.py
+++ b/gramps2/src/gramps_main.py
@@ -977,7 +977,6 @@ class Gramps:
 
     def on_new_clicked(self,obj):
         """Prompt for permission to close the current database"""
-        self.db.close()
         prompter = DbPrompter.NewNativeDbPrompter(self,self.topWindow)
         prompter.chooser()