diff --git a/db_qbe.php b/db_qbe.php
index c72602e2c..ff8c7cd86 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -156,7 +156,7 @@ function showColumnSelectCell($columns, $column_number, $selected = '')
     ?>
     <td align="center">
         <select name="Field[<?php echo $column_number; ?>]" size="1">
-            <option value=""></option>
+            <option value="">&nbsp;</option>
     <?php
     foreach ($columns as $column) {
         if ($column === $selected) {
@@ -213,7 +213,7 @@ for ($x = 0; $x < $col; $x++) {
         ?>
     <td align="center">
         <select style="width: <?php echo $realwidth; ?>" name="Sort[<?php echo $z; ?>]" size="1">
-            <option value=""></option>
+            <option value="">&nbsp;</option>
             <option value="ASC"><?php echo $strAscending; ?></option>
             <option value="DESC"><?php echo $strDescending; ?></option>
         </select>
@@ -229,7 +229,7 @@ for ($x = 0; $x < $col; $x++) {
     ?>
     <td align="center">
         <select style="width: <?php echo $realwidth; ?>" name="Sort[<?php echo $z; ?>]" size="1">
-            <option value=""></option>
+            <option value="">&nbsp;</option>
     <?php
     echo "\n";
 
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index c72886607..9dfdd206e 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1276,7 +1276,7 @@ function PMA_profilingCheckbox($sql_query) {
     // 5.0.37 has profiling but for example, 5.1.20 does not
     // (avoid doing a fetch_value for MySQL before 5.0.37)
     if (PMA_MYSQL_INT_VERSION >= 50037 && PMA_DBI_fetch_value("SHOW VARIABLES LIKE 'profiling'")) {
-        echo '<form action="sql.php" method="post" />' . "\n";
+        echo '<form action="sql.php" method="post">' . "\n";
         echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']);
         echo '<input type="hidden" name="sql_query" value="' . $sql_query . '" />' . "\n";
         echo '<input type="hidden" name="profiling_form" value="1" />' . "\n";
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index e40aa84fa..d77280422 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -80,7 +80,7 @@ if (!empty($cfg['UploadDir'])) {
         echo "\n";
         echo '    <i>' . $strOr . '</i><br/><label for="select_local_import_file">' . $strWebServerUploadDirectory . '</label>&nbsp;: ' . "\n";
         echo '    <select style="margin: 5px" size="1" name="local_import_file" onchange="match_file(this.value)" id="select_local_import_file">' . "\n";
-        echo '        <option value=""></option>' . "\n";
+        echo '        <option value="">&nbsp;</option>' . "\n";
         echo $files;
         echo '    </select>' . "\n";
     }
diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php
index f5896a2e5..b4a6d3b07 100644
--- a/libraries/mysql_charsets.lib.php
+++ b/libraries/mysql_charsets.lib.php
@@ -74,7 +74,7 @@ if (PMA_MYSQL_INT_VERSION >= 40100){
         if ($label) {
             $return_str .= $spacer . '    <option value="">' . ($type == PMA_CSDROPDOWN_COLLATION ? $GLOBALS['strCollation'] : $GLOBALS['strCharset']) . '</option>' . "\n";
         }
-        $return_str .= $spacer . '    <option value=""></option>' . "\n";
+        $return_str .= $spacer . '    <option value="">&nbsp;</option>' . "\n";
         foreach ($mysql_charsets as $current_charset) {
             if (!$mysql_charsets_available[$current_charset]) {
                 continue;
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index 794831dd0..272bcda1c 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -972,14 +972,14 @@ function PMA_foreignDropdown($disp_row, $foreign_field, $foreign_display, $data,
     }
 
     // beginning of dropdown
-    $ret = '<option value=""></option>' . "\n";
+    $ret = '<option value="">&nbsp;</option>' . "\n";
 
     $top_count = count($top);
     if ($max == -1 || $top_count < $max) {
         $ret .= implode('', $top);
         if ($top_count > 0) {
-            $ret .= '                <option value=""></option>' . "\n";
-            $ret .= '                <option value=""></option>' . "\n";
+            $ret .= '                <option value="">&nbsp;</option>' . "\n";
+            $ret .= '                <option value="">&nbsp;</option>' . "\n";
         }
     }
     $ret .= implode('', $bot);
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 3ca2d6371..c4af277c3 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -424,7 +424,7 @@ function PMA_sqlQueryFormBookmark()
     echo $GLOBALS['strBookmarkQuery'] . '</legend>' . "\n";
     echo '<div class="formelement">';
     echo '<select name="id_bookmark">' . "\n";
-    echo '<option value=""></option>' . "\n";
+    echo '<option value="">&nbsp;</option>' . "\n";
     foreach ($bookmark_list as $key => $value) {
         echo '<option value="' . htmlspecialchars($key) . '">'
             .htmlspecialchars($value) . '</option>' . "\n";
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index aedbfcd12..14e4d0562 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -459,12 +459,12 @@ for ($i = 0 ; $i <= $num_fields; $i++) {
 
     if (!isset($row) || empty($row['Extra'])) {
         $content_cells[$i][$ci] .= "\n";
-        $content_cells[$i][$ci] .= '<option value=""></option>' . "\n";
+        $content_cells[$i][$ci] .= '<option value="">&nbsp;</option>' . "\n";
         $content_cells[$i][$ci] .= '<option value="AUTO_INCREMENT">auto_increment</option>' . "\n";
     } else {
         $content_cells[$i][$ci] .= "\n";
         $content_cells[$i][$ci] .= '<option value="AUTO_INCREMENT">auto_increment</option>' . "\n";
-        $content_cells[$i][$ci] .= '<option value=""></option>' . "\n";
+        $content_cells[$i][$ci] .= '<option value="">&nbsp;</option>' . "\n";
     }
 
     $content_cells[$i][$ci] .= "\n" . '</select>';
@@ -527,7 +527,7 @@ for ($i = 0 ; $i <= $num_fields; $i++) {
     // garvin: MIME-types
     if ($cfgRelation['mimework'] && $cfg['BrowseMIME'] && $cfgRelation['commwork']) {
         $content_cells[$i][$ci] = '<select id="field_' . $i . '_' . ($ci - $ci_offset) . '" size="1" name="field_mimetype[]">' . "\n";
-        $content_cells[$i][$ci] .= '    <option value=""></option>' . "\n";
+        $content_cells[$i][$ci] .= '    <option value="">&nbsp;</option>' . "\n";
 
         if (is_array($available_mime['mimetype'])) {
             foreach ($available_mime['mimetype'] AS $mimekey => $mimetype) {
diff --git a/tbl_change.php b/tbl_change.php
index e155c73eb..93b27a2fb 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -693,7 +693,7 @@ foreach ($loop_array as $vrowcount => $vrow) {
                     <?php echo $unnullify_trigger; ?>
                     tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>"
                     id="field_<?php echo ($idindex); ?>_3">
-                    <option value=""></option>
+                    <option value="">&nbsp;</option>
                 <?php
                 echo "\n";
 
@@ -1037,7 +1037,7 @@ if ($insert_mode) {
             echo '<input type="hidden" name="primary_key[' . $rowcount . ']" value="' . htmlspecialchars(trim($primary_key)) . '" />'. "\n";
         }
     }
-    $tmp = '<select name="insert_rows" id="insert_rows" onchange="this.form.submit();" />' . "\n";
+    $tmp = '<select name="insert_rows" id="insert_rows" onchange="this.form.submit();" >' . "\n";
     $option_values = array(1,2,5,10,15,20,30,40);
     foreach ($option_values as $value) {
         $tmp .= '<option value="' . $value . '"';