diff --git a/ChangeLog b/ChangeLog
index d7a5288d2..3ec8be5b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 2006-05-10  Alex Roitman  <shura@gramps-project.org>
+	* src/DataViews/_MediaView.py (edit): Handle the exception.
 	* src/plugins/BookReport.py (__init__): Fix url.
 	* src/plugins/ChangeTypes.py (run_tool): Disable/enable signals.
 	* src/plugins/ReorderIds.py (__init__): Disable/enable signals.
diff --git a/src/DataViews/_MediaView.py b/src/DataViews/_MediaView.py
index 36f3a2c79..8e0e21786 100644
--- a/src/DataViews/_MediaView.py
+++ b/src/DataViews/_MediaView.py
@@ -38,7 +38,8 @@ import ImgManip
 import const
 import Utils
 import Bookmarks
-
+from Editors import EditMedia
+import Errors
 from QuestionDialog import QuestionDialog, ErrorDialog
 
 #-------------------------------------------------------------------------
@@ -197,8 +198,10 @@ class MediaView(PageView.ListView):
             return
         
         obj = self.dbstate.db.get_object_from_handle(handle)
-        from Editors import EditMedia
-        EditMedia(self.dbstate,self.uistate, [], obj)
+        try:
+            EditMedia(self.dbstate,self.uistate, [], obj)
+        except Errors.WindowActiveError:
+            pass
 
 class DeleteMediaQuery: