Index: src/orca/orca-setup.glade
===================================================================
--- src/orca/orca-setup.glade	(revision 2289)
+++ src/orca/orca-setup.glade	(working copy)
@@ -749,9 +749,6 @@
 					  <property name="width_chars">-1</property>
 					  <property name="single_line_mode">False</property>
 					  <property name="angle">0</property>
-					  <accessibility>
-					    <atkrelation target="noneButton" type="label-for"/>
-					  </accessibility>
 					</widget>
 					<packing>
 					  <property name="type">label_item</property>
@@ -867,9 +864,6 @@
 					  <property name="width_chars">-1</property>
 					  <property name="single_line_mode">False</property>
 					  <property name="angle">0</property>
-					  <accessibility>
-					    <atkrelation target="speechBriefButton" type="label-for"/>
-					  </accessibility>
 					</widget>
 					<packing>
 					  <property name="type">label_item</property>
@@ -1471,9 +1465,6 @@
 			  <property name="width_chars">-1</property>
 			  <property name="single_line_mode">False</property>
 			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="brailleBriefButton" type="label-for"/>
-			  </accessibility>
 			</widget>
 			<packing>
 			  <property name="type">label_item</property>
Index: src/orca/default.py
===================================================================
--- src/orca/default.py	(revision 2289)
+++ src/orca/default.py	(working copy)
@@ -4094,13 +4094,20 @@
             if ((object.role == rolenames.ROLE_FILLER) \
                     or (object.role == rolenames.ROLE_PANEL)) \
                 and (object.childCount == 2):
-
-                potentialLabel = object.child(0)
-                secondChild = object.child(1)
-                useLabel = potentialLabel.role == rolenames.ROLE_LABEL \
-                        and ((secondChild.role == rolenames.ROLE_FILLER) \
-                                or (secondChild.role == rolenames.ROLE_PANEL)) \
-                        and not self.__hasLabelForRelation(potentialLabel)
+                child0 = object.child(0)
+                child1 = object.child(1)
+                if child0.role == rolenames.ROLE_LABEL \
+                    and not self.__hasLabelForRelation(child0) \
+                    and child1.role in [rolenames.ROLE_FILLER, \
+                                        rolenames.ROLE_PANEL]:
+                    useLabel = True
+                    potentialLabel = child0
+                elif child1.role == rolenames.ROLE_LABEL \
+                    and not self.__hasLabelForRelation(child1) \
+                    and child0.role in [rolenames.ROLE_FILLER, \
+                                        rolenames.ROLE_PANEL]:
+                    useLabel = True
+                    potentialLabel = child1
             else:
                 parent = object.parent
                 if parent and \
@@ -4436,7 +4443,7 @@
         offset = text.caretOffset
 
         # Determine the correct "say all by" mode to use.
-        #        
+        #
         if settings.sayAllStyle == settings.SAYALL_STYLE_SENTENCE:
             mode = atspi.Accessibility.TEXT_BOUNDARY_SENTENCE_END
         elif settings.sayAllStyle == settings.SAYALL_STYLE_LINE:
