diff --git a/ChangeLog b/ChangeLog
index c577ea720..5d77c66e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 2006-05-15  Alex Roitman  <shura@gramps-project.org>
+	* src/DataViews/_SourceView.py (edit,on_double_click): Catch exception.
 	* configure.in: Generate new Makefile.
 	* src/Makefile.am: adapt to new module.
 	* src/Selectors: separate selectors in their own module.
diff --git a/src/DataViews/_SourceView.py b/src/DataViews/_SourceView.py
index 1012a3314..1533781d6 100644
--- a/src/DataViews/_SourceView.py
+++ b/src/DataViews/_SourceView.py
@@ -38,7 +38,7 @@ import DisplayModels
 import const
 import Utils
 import Bookmarks
-
+import Errors
 from DdTargets import DdTargets
 from Editors import EditSource, DelSrcQuery
 from QuestionDialog import QuestionDialog, ErrorDialog
@@ -151,7 +151,10 @@ class SourceView(PageView.ListView):
     def on_double_click(self,obj,event):
         handle = self.first_selected()
         source = self.dbstate.db.get_source_from_handle(handle)
-        EditSource(self.dbstate, self.uistate, [], source)
+        try:
+            EditSource(self.dbstate, self.uistate, [], source)
+        except Errors.WindowActiveError:
+            pass
 
     def add(self,obj):
         EditSource(self.dbstate, self.uistate, [], RelLib.Source())
@@ -186,5 +189,8 @@ class SourceView(PageView.ListView):
 
         for handle in mlist:
             source = self.dbstate.db.get_source_from_handle(handle)
-            EditSource(self.dbstate, self.uistate, [], source)
+            try:
+                EditSource(self.dbstate, self.uistate, [], source)
+            except Errors.WindowActiveError:
+                pass