diff --git a/ChangeLog b/ChangeLog
index c3f83bcba..fe33a270e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 2006-06-21  Don Allingham  <don@gramps-project.org>
+	* src/DataViews/_PersonView.py: import QuestionDialog
 	* src/Editors/_EditFamily.py: re-enable disabled blocks after
 	the + is clicked
 
diff --git a/src/DataViews/_PersonView.py b/src/DataViews/_PersonView.py
index b25cf2112..848df6f90 100644
--- a/src/DataViews/_PersonView.py
+++ b/src/DataViews/_PersonView.py
@@ -59,6 +59,7 @@ import TreeTips
 import Errors
 import Config
 import const
+from QuestionDialog import ErrorDialog
 
 from Editors import EditPerson
 from Filters import SearchBar, GenericFilter, PersonSidebarFilter
@@ -149,15 +150,12 @@ class PersonView(PageView.PersonNavView):
         mlist = self.get_selected_objects()
 
         if len(mlist) != 2:
-            from QuestionDialog import ErrorDialog
-            
             ErrorDialog(
 		_("Cannot merge people"),
 		_("Exactly two people must be selected to perform a merge. "
 		  "A second person can be selected by holding down the "
 		  "control key while clicking on the desired person."))
         else:
-            from QuestionDialog import ErrorDialog
             import Merge 
             p1 = self.db.get_person_from_handle(mlist[0])
             p2 = self.db.get_person_from_handle(mlist[1])