diff --git a/capplets/file-types/ChangeLog b/capplets/file-types/ChangeLog
index 0b1578d0f..e0ade4da5 100644
--- a/capplets/file-types/ChangeLog
+++ b/capplets/file-types/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-16  Padraig O'Briain <padraig.obriain@sun.com>
+
+	* file-types-properties.glade: Remove unnecessary setting of ATK 
+	relations. The module gail will ensure that the labels are set
+	correctly. Set mnemonic widget to be a GnomeFileEntry instead of 
+	a GtkEntry in the combo box. Fixes bug #134131.
+
 2004-02-13  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.5.3
diff --git a/capplets/file-types/file-types-properties.glade b/capplets/file-types/file-types-properties.glade
index 6f449a62f..05d4b3cc7 100644
--- a/capplets/file-types/file-types-properties.glade
+++ b/capplets/file-types/file-types-properties.glade
@@ -749,10 +749,7 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">combo-entry1</property>
-			  <accessibility>
-			    <atkrelation target="combo-entry1" type="label-for"/>
-			  </accessibility>
+			  <property name="mnemonic_widget">program_entry</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -779,9 +776,6 @@
 			      <property name="has_frame">True</property>
 			      <property name="invisible_char" translatable="yes">*</property>
 			      <property name="activates_default">False</property>
-			      <accessibility>
-				<atkrelation target="program_label" type="labelled-by"/>
-			      </accessibility>
 			    </widget>
 			  </child>
 			</widget>
@@ -1108,10 +1102,7 @@
                             <property name="ypad">0</property>
                             <property name="visible">yes</property>
 			    <property name="use_underline">True</property>
-			    <property name="mnemonic_widget">combo-entry2</property>
-			    <accessibility>
-			      <atkrelation target="combo-entry2" type="label-for"/>
-			    </accessibility>
+			    <property name="mnemonic_widget">custom_program_entry</property>
                           </widget>
                           <packing>
                             <property name="padding">0</property>
@@ -1134,9 +1125,6 @@
                                 <property name="max-length">0</property>
                                 <property name="visibility">yes</property>
                                 <property name="visible">yes</property>
-				<accessibility>
-				  <atkrelation target="custom_program_label" type="labelled-by"/>
-				</accessibility>
                               </widget>
                             </child>
                           </widget>
@@ -1397,9 +1385,6 @@
                             <property name="visible">yes</property>
 			    <property name="use_underline">True</property>
 			    <property name="mnemonic_widget">program_entry</property>
-			    <accessibility>
-				<atkrelation target="entry2" type="label-for"/>
-			    </accessibility>
                           </widget>
                           <packing>
                             <property name="padding">0</property>
@@ -1422,9 +1407,6 @@
                                 <property name="max-length">0</property>
                                 <property name="visibility">yes</property>
                                 <property name="visible">yes</property>
-				<accessibility>
-				  <atkrelation target="program_label" type="labelled-by"/>
-				</accessibility>
                               </widget>
                             </child>
                           </widget>