diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 6db6469b4..2ba9253d4 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-24  Alex Roitman  <shura@gramps-project.org>
+	* src/ReportBase/_ReportDialog.py (report): Handle wm closing.
+	* src/plugins/GraphViz.py (GraphVizDialog.__init__): Handle wm
+	closing. 
+	* src/plugins/NarrativeWeb.py (WebReportDialog.__init__): Handle
+	wm closing.
+
 2006-06-25  Brian Matherly  <brian@gramps-project.org>
 	* src/plugins/AncestorChart2.py: fix comment
 	* src/plugins/DecendChart.py: fix comment
diff --git a/gramps2/src/ReportBase/_ReportDialog.py b/gramps2/src/ReportBase/_ReportDialog.py
index 86599cb1d..66f3c60a2 100644
--- a/gramps2/src/ReportBase/_ReportDialog.py
+++ b/gramps2/src/ReportBase/_ReportDialog.py
@@ -654,4 +654,6 @@ def report(dbstate,uistate,person,report_class,options_class,
             ErrorDialog(_("Report could not be created"),str(msg))
         except:
             log.error("Failed to run report.", exc_info=True)
+    elif response == gtk.RESPONSE_DELETE_EVENT:
+        return
     dialog.close()
diff --git a/gramps2/src/plugins/GraphViz.py b/gramps2/src/plugins/GraphViz.py
index 9a9485244..cc83079d3 100644
--- a/gramps2/src/plugins/GraphViz.py
+++ b/gramps2/src/plugins/GraphViz.py
@@ -943,6 +943,8 @@ class GraphVizDialog(ReportDialog):
                 self.make_report()
             except (IOError,OSError),msg:
                 ErrorDialog(str(msg))
+        elif response == gtk.RESPONSE_DELETE_EVENT:
+            return
         self.close()
 
     def make_doc_menu(self,active=None):
diff --git a/gramps2/src/plugins/NarrativeWeb.py b/gramps2/src/plugins/NarrativeWeb.py
index bcedde41b..03b9acfdf 100644
--- a/gramps2/src/plugins/NarrativeWeb.py
+++ b/gramps2/src/plugins/NarrativeWeb.py
@@ -2605,6 +2605,8 @@ class WebReportDialog(ReportDialog):
         response = self.window.run()
         if response == gtk.RESPONSE_OK:
             self.make_report()
+        elif response == gtk.RESPONSE_DELETE_EVENT:
+            return
         self.close()
 
     def setup_style_frame(self):