diff --git a/db_details.php b/db_details.php
index 6a928adf6..830af4140 100644
--- a/db_details.php
+++ b/db_details.php
@@ -207,7 +207,7 @@ if ($is_upload || $is_upload_dir) {
     } elseif (PMA_MYSQL_INT_VERSION >= 40100) {
         echo '    <tr bgcolor="' .$cfg['BgcolorTwo'] . '"><td>' . "\n"
            . $strCharsetOfFile . "\n";
-        echo PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_CHARSET, 'charset_of_file', NULL, FALSE);
+        echo PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_CHARSET, 'charset_of_file', NULL, 'utf8', FALSE);
         echo '    </td>' . "\n";
         echo '    <td align="right"><input type="submit" name="SQL" value="' . $strGo . '" /></td>' . "\n";
         echo '    </tr>' . "\n";
diff --git a/tbl_query_box.php b/tbl_query_box.php
index 10d49b1bd..571944860 100644
--- a/tbl_query_box.php
+++ b/tbl_query_box.php
@@ -396,11 +396,10 @@ if (($is_upload || $is_upload_dir) &&
         echo '    </tr>' . "\n";
     } // end if (recoding)
     else if (PMA_MYSQL_INT_VERSION >= 40100) {
-        echo '    <tr bgcolor="' .$cfg['BgcolorTwo'] . '"><td>' . "\n"
+        echo '    <tr bgcolor="' .$cfg['BgcolorTwo'] . '"><td' . $queryframe_thcolspan . '>' . "\n"
            . $strCharsetOfFile . "\n"
-           . PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_CHARSET, 'charset_of_file', NULL, FALSE)
+           . PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_CHARSET, 'charset_of_file', NULL, 'utf8', FALSE)
            . '    </td>' . "\n"
-           . '    <td align="right"><input type="submit" name="SQL" value="' . $strGo . '" /></td>' . "\n"
            . '    </tr>' . "\n";
     }
     echo '    <tr bgcolor="' . $cfg['BgcolorTwo'] . '">' . "\n"