diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index e9d373ee5..41fbd6d7a 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-27  Brian Matherly  <brian@gramps-project.org>
+    * src/ReportBase/_StyleEditor.py: Make style editor not modal
+    * src/glade/gramps.glade: Make style editor not modal
+
 2006-09-26  Brian Matherly  <brian@gramps-project.org>
     * src/GrampsLogger/_ErrorReportAssistant.py: Fix typo.
 
diff --git a/gramps2/src/ReportBase/_StyleEditor.py b/gramps2/src/ReportBase/_StyleEditor.py
index 2df59b6bf..24004774e 100644
--- a/gramps2/src/ReportBase/_StyleEditor.py
+++ b/gramps2/src/ReportBase/_StyleEditor.py
@@ -215,6 +215,11 @@ class StyleEditor:
         for p_name in names:
             self.plist.add([p_name],self.style.get_style(p_name))
         self.plist.select_row(0)
+        
+        if self.parent:
+            self.window.set_transient_for(parent.window)
+        self.window.run()
+        self.window.destroy()
 
     def draw(self,name,p):
         """Updates the display with the selected paragraph."""
diff --git a/gramps2/src/glade/gramps.glade b/gramps2/src/glade/gramps.glade
index cd1a9d23f..d5929e687 100644
--- a/gramps2/src/glade/gramps.glade
+++ b/gramps2/src/glade/gramps.glade
@@ -2740,7 +2740,7 @@
   <property name="title" translatable="yes"></property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">True</property>
+  <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
   <property name="decorated">True</property>