diff --git a/ChangeLog b/ChangeLog
index a1ab87f87..bcacc38f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2006-05-13  Brian Matherly  <brian@gramps-project.org>
 	* src/plugins/NarrativeWeb.py: Add option for number of generations in
-	  ancestor graph (bug # 0000077)
+	  ancestor graph (bug #0000077)
+	* src/PluginUtils/_Report.py: Fix custom paper size bug (bug #0000084)
 
 2006-05-13  Don Allingham  <don@gramps-project.org>
 	* src/DataViews/_FamilyView.py (FamilyView.redraw): handle history
diff --git a/src/PluginUtils/_Report.py b/src/PluginUtils/_Report.py
index 20e243ff5..fd60d1a61 100644
--- a/src/PluginUtils/_Report.py
+++ b/src/PluginUtils/_Report.py
@@ -1250,12 +1250,15 @@ class ReportDialog(BareReportDialog):
 
     def size_changed(self,obj):
         (paper,name) = self.papersize_menu.get_value()
-        if paper.get_width() <= 0:
+
+        if name == "Custom Size":
             self.pwidth.set_sensitive(1)
             self.pheight.set_sensitive(1)
         else:
             self.pwidth.set_sensitive(0)
             self.pheight.set_sensitive(0)
+
+        if paper.get_width() > 0 and paper.get_height() > 0:
             self.pwidth.set_text("%.2f" % paper.get_width())
             self.pheight.set_text("%.2f" % paper.get_height())