diff --git a/ChangeLog b/ChangeLog
index 63e2cf20a..b5dadaedb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-08-01  Alex Roitman  <shura@alex.neuro.umn.edu>
+	* src/plugins/writeftree.glade: Swap OK and Cancel buttons (HIG).
+	* src/plugins/cdexport.glade: Likewise.
+	* src/plugins/gedcomexport.glade: Likewise.
+	* src/plugins/pkgexport.glade: Likewise.
+	* src/plugins/ReadGedcom.py: Fix Cancel button (was destroying itself).
+
 2003-08-01  Don Allingham  <dallingham@users.sourceforge.net>
 	* src/plugins/GraphViz.py: toggle sensitivity on year button if based
 	of date button selection, add new tab for page options to reduce 
diff --git a/src/plugins/ReadGedcom.py b/src/plugins/ReadGedcom.py
index 0684f60eb..ab581990f 100644
--- a/src/plugins/ReadGedcom.py
+++ b/src/plugins/ReadGedcom.py
@@ -1764,7 +1764,7 @@ def readData(database,active_person,cb):
     file_top = gtk.FileSelection("%s - GRAMPS" % _title_string)
     file_top.hide_fileop_buttons()
     file_top.ok_button.connect('clicked', on_ok_clicked)
-    file_top.cancel_button.connect('clicked', Utils.destroy_passed_object)
+    file_top.cancel_button.connect('clicked', on_cancel_clicked)
     file_top.show()
 
 #-------------------------------------------------------------------------
@@ -1784,6 +1784,9 @@ def on_ok_clicked(obj):
         import DisplayTrace
         DisplayTrace.DisplayTrace()
 
+def on_cancel_clicked(obj):
+    file_top.destroy()
+
 #-------------------------------------------------------------------------
 #
 #
diff --git a/src/plugins/cdexport.glade b/src/plugins/cdexport.glade
index 9df8a9fed..a30c8234a 100644
--- a/src/plugins/cdexport.glade
+++ b/src/plugins/cdexport.glade
@@ -25,6 +25,19 @@
 	  <property name="visible">True</property>
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 
+	  <child>
+	    <widget class="GtkButton" id="cancel">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-cancel</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="response_id">0</property>
+	      <signal name="clicked" handler="destroy_passed_object" object="packageExport"/>
+	    </widget>
+	  </child>
+
 	  <child>
 	    <widget class="GtkButton" id="ok">
 	      <property name="visible">True</property>
@@ -91,19 +104,6 @@
 	      </child>
 	    </widget>
 	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="cancel">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	      <signal name="clicked" handler="destroy_passed_object" object="packageExport"/>
-	    </widget>
-	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
diff --git a/src/plugins/gedcomexport.glade b/src/plugins/gedcomexport.glade
index ff4948ea0..aa5471d74 100644
--- a/src/plugins/gedcomexport.glade
+++ b/src/plugins/gedcomexport.glade
@@ -26,6 +26,19 @@
 	  <property name="visible">True</property>
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 
+	  <child>
+	    <widget class="GtkButton" id="cancel">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-cancel</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="response_id">0</property>
+	      <signal name="clicked" handler="destroy_passed_object" object="gedcomExport"/>
+	    </widget>
+	  </child>
+
 	  <child>
 	    <widget class="GtkButton" id="ok">
 	      <property name="visible">True</property>
@@ -39,18 +52,6 @@
 	    </widget>
 	  </child>
 
-	  <child>
-	    <widget class="GtkButton" id="cancel">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	      <signal name="clicked" handler="destroy_passed_object" object="gedcomExport"/>
-	    </widget>
-	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
diff --git a/src/plugins/pkgexport.glade b/src/plugins/pkgexport.glade
index a55dbfc4f..2f6c91423 100644
--- a/src/plugins/pkgexport.glade
+++ b/src/plugins/pkgexport.glade
@@ -26,6 +26,19 @@
 	  <property name="visible">True</property>
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 
+	  <child>
+	    <widget class="GtkButton" id="cancel">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-cancel</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="response_id">0</property>
+	      <signal name="clicked" handler="destroy_passed_object" object="packageExport"/>
+	    </widget>
+	  </child>
+
 	  <child>
 	    <widget class="GtkButton" id="ok">
 	      <property name="visible">True</property>
@@ -39,18 +52,6 @@
 	    </widget>
 	  </child>
 
-	  <child>
-	    <widget class="GtkButton" id="cancel">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	      <signal name="clicked" handler="destroy_passed_object" object="packageExport"/>
-	    </widget>
-	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
diff --git a/src/plugins/writeftree.glade b/src/plugins/writeftree.glade
index e5a3b1749..270e36c9b 100644
--- a/src/plugins/writeftree.glade
+++ b/src/plugins/writeftree.glade
@@ -26,6 +26,19 @@
 	  <property name="visible">True</property>
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 
+	  <child>
+	    <widget class="GtkButton" id="cancel">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-cancel</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="response_id">0</property>
+	      <signal name="clicked" handler="destroy_passed_object" object="gedcomExport"/>
+	    </widget>
+	  </child>
+
 	  <child>
 	    <widget class="GtkButton" id="ok">
 	      <property name="visible">True</property>
@@ -39,18 +52,6 @@
 	    </widget>
 	  </child>
 
-	  <child>
-	    <widget class="GtkButton" id="cancel">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	      <signal name="clicked" handler="destroy_passed_object" object="gedcomExport"/>
-	    </widget>
-	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>