diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php
index e2a025320..500db02f2 100644
--- a/libraries/display_select_lang.lib.php
+++ b/libraries/display_select_lang.lib.php
@@ -26,7 +26,6 @@ function PMA_select_language($use_fieldset = FALSE) {
     ?>
 
 <form method="post" action="index.php" target="_parent">
-    <bdo xml:lang="en" dir="ltr">
     <?php
     if (isset($GLOBALS['collation_connection'])) {
         echo '            <input type="hidden" name="collation_connection" value="'
@@ -48,27 +47,19 @@ function PMA_select_language($use_fieldset = FALSE) {
         echo '            <input type="hidden" name="server" value="'
             . ((int)$GLOBALS['server']) . '" />' . "\n";
     }
-    if ($use_fieldset) {
-        echo '<fieldset>';
-        echo '<legend>';
-    }
-    ?>
 
-            Language <a href="./translators.html" target="documentation"><?php
-            if ( $cfg['ReplaceHelpImg'] ) {
-                echo '<img class="icon" src="' . $GLOBALS['pmaThemeImage']
-                    . 'b_info.png" width="11" height="11" alt="Info" />';
-            } else { echo '(*)'; }
-?></a>
-    <?php
+    $language_title = 'Language <a href="./translators.html" target="documentation">' .
+            ( $cfg['ReplaceHelpImg'] ? 
+                '<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_info.png" width="11" height="11" alt="Info" />' :
+                '(*)' ) . '</a>';
     if ($use_fieldset) {
-        echo '</legend>';
+        echo '<fieldset><legend xml:lang="en" dir="ltr">' . $language_title . '</legend>';
     } else {
-        echo ':';
+        echo '<bdo xml:lang="en" dir="ltr">' . $language_title . ':</bdo>';
     }
     ?>
 
-    <select name="lang" onchange="this.form.submit();">
+    <select name="lang" onchange="this.form.submit();" xml:lang="en" dir="ltr">
     <?php
 
     uasort($GLOBALS['available_languages'], 'PMA_language_cmp');
@@ -121,7 +112,6 @@ function PMA_select_language($use_fieldset = FALSE) {
     ?>
 
     </noscript>
-    </bdo>
 </form>
     <?php
 } // End of function PMA_select_language