diff --git a/db_export.php b/db_export.php
index c1303871a..75305e055 100644
--- a/db_export.php
+++ b/db_export.php
@@ -50,7 +50,8 @@ foreach ($tables as $each_table) {
     }
     $table_html   = htmlspecialchars($each_table['Name']);
     $multi_values .= '                <option value="' . $table_html . '"'
-        . $is_selected . '>' . $table_html . '</option>' . "\n";
+        . $is_selected . '>'
+        . str_replace(' ', '&nbsp;', $table_html) . '</option>' . "\n";
 } // end for
 $multi_values .= "\n";
 $multi_values .= '</select></div>';
diff --git a/db_qbe.php b/db_qbe.php
index b7da986f1..2c80f6103 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -166,7 +166,7 @@ function showColumnSelectCell($columns, $column_number, $selected = '')
         }
         echo '                ';
         echo '<option value="' . htmlspecialchars($column) . '"' . $sel . '>'
-            . htmlspecialchars($column) . '</option>' . "\n";
+            . str_replace(' ', '&nbsp;', htmlspecialchars($column)) . '</option>' . "\n";
     }
     ?>
         </select>
@@ -629,7 +629,8 @@ $strTableListOptions = '';
 $numTableListOptions = 0;
 foreach ($tbl_names AS $key => $val) {
     $strTableListOptions .= '                        ';
-    $strTableListOptions .= '<option value="' . htmlspecialchars($key) . '"' . $val . '>' . htmlspecialchars($key) . '</option>' . "\n";
+    $strTableListOptions .= '<option value="' . htmlspecialchars($key) . '"' . $val . '>'
+        . str_replace(' ', '&nbsp;', htmlspecialchars($key)) . '</option>' . "\n";
     $numTableListOptions++;
 }
 ?>
diff --git a/db_search.php b/db_search.php
index 53d8622c0..ba8f8b968 100644
--- a/db_search.php
+++ b/db_search.php
@@ -340,7 +340,7 @@ foreach ($tables_names_only as $each_table) {
 
     echo '                <option value="' . htmlspecialchars($each_table) . '"'
         . $is_selected . '>'
-        . htmlspecialchars($each_table) . '</option>' . "\n";
+        . str_replace(' ', '&nbsp;', htmlspecialchars($each_table)) . '</option>' . "\n";
 } // end while
 
 echo '            </select>' . "\n";
diff --git a/db_structure.php b/db_structure.php
index ba01f0925..52b5e259b 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -193,11 +193,11 @@ foreach ($tables as $keyname => $each_table) {
                        || $each_table['TABLE_TYPE'] === 'SYSTEM VIEW');
 
     $alias = (!empty($tooltip_aliasname) && isset($tooltip_aliasname[$each_table['TABLE_NAME']]))
-               ? htmlspecialchars($tooltip_aliasname[$each_table['TABLE_NAME']])
-               :  htmlspecialchars($each_table['TABLE_NAME']);
+               ? str_replace(' ', '&nbsp;', htmlspecialchars($tooltip_truename[$each_table['TABLE_NAME']]))
+               : str_replace(' ', '&nbsp;', htmlspecialchars($each_table['TABLE_NAME']));
     $truename = (!empty($tooltip_truename) && isset($tooltip_truename[$each_table['TABLE_NAME']]))
-               ? htmlspecialchars($tooltip_truename[$each_table['TABLE_NAME']])
-               : htmlspecialchars($each_table['TABLE_NAME']);
+               ? str_replace(' ', '&nbsp;', htmlspecialchars($tooltip_truename[$each_table['TABLE_NAME']]))
+               : str_replace(' ', '&nbsp;', htmlspecialchars($each_table['TABLE_NAME']));
 
     // Sets parameters for links
     $tbl_url_query = $url_query . '&amp;table=' . $table_encoded;
@@ -240,7 +240,7 @@ foreach ($tables as $keyname => $each_table) {
             . ' ' . PMA_backquote($each_table['TABLE_NAME']);
         $drop_message = sprintf(
             $table_is_view ? $strViewHasBeenDropped : $strTableHasBeenDropped,
-            htmlspecialchars($each_table['TABLE_NAME']));
+            str_replace(' ', '&nbsp;', htmlspecialchars($each_table['TABLE_NAME'])));
     }
 
     // loic1: Patch from Joshua Nye <josh at boxcarmedia.com> to get valid
diff --git a/libraries/header.inc.php b/libraries/header.inc.php
index 53b4fdc10..ed52691f2 100644
--- a/libraries/header.inc.php
+++ b/libraries/header.inc.php
@@ -216,7 +216,7 @@ if (empty($GLOBALS['is_header_sent'])) {
                 printf($item,
                         $GLOBALS['cfg']['DefaultTabTable'],
                         PMA_generate_common_url($GLOBALS['db'], $GLOBALS['table']),
-                        htmlspecialchars($GLOBALS['table']),
+                        str_replace(' ', '&nbsp;', htmlspecialchars($GLOBALS['table'])),
                         (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? $GLOBALS['strView'] : $GLOBALS['strTable']),
                         (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? 'b_views' : 's_tbl') . '.png');
 
diff --git a/navigation.php b/navigation.php
index 5f57e77de..b5aabdc31 100644
--- a/navigation.php
+++ b/navigation.php
@@ -558,7 +558,8 @@ function PMA_displayTableList($tables, $visible = false,
                 .'<a href="' . $href . '" title="' . htmlspecialchars($table['Comment']
                 .' (' . PMA_formatNumber($table['Rows'], 0) . ' ' . $GLOBALS['strRows']) . ')"'
                 .' id="' . htmlspecialchars($table_db . '.' . $table['Name']) . '">'
-                . htmlspecialchars($table['disp_name']) . '</a>';
+                // preserve spaces in table name
+                . str_replace(' ', '&nbsp;', htmlspecialchars($table['disp_name'])) . '</a>';
             echo '</li>' . "\n";
         }
     }