diff --git a/ChangeLog b/ChangeLog
index 2490de0e7e..3d88127c71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,7 @@ phpMyAdmin - ChangeLog
 - bug #4558 Unable to Add Rows while Creating Table
 + rfe #1547 Wrap No Tables Found message with message box
 - bug #4559 Logging in causes 100% CPU usage
+- bug #4564 Designer: spaces in table name with edit table link generates bad links
 
 4.2.11.0 (not yet released)
 - bug       ReferenceError: Table_onover is not defined
diff --git a/libraries/db_designer.lib.php b/libraries/db_designer.lib.php
index c07513ec80..e069000a77 100644
--- a/libraries/db_designer.lib.php
+++ b/libraries/db_designer.lib.php
@@ -482,7 +482,7 @@ function PMA_getHTMLTableList($tab_pos, $display_page)
         $html .= 'onmouseover="this.className=\'L_butt2_2\'" ';
         $html .= 'onmouseout="this.className=\'L_butt2_1\'" class="L_butt2_1">';
         $html .= '<img onclick="Start_tab_upd(\'';
-        $html .= $GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i] . '\');" alt="" ';
+        $html .= $GLOBALS['PMD']["TABLE_NAME_SMALL"][$i] . '\');" alt="" ';
         $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/exec.png')
             . '"/>';
         $html .= '</td>';
@@ -600,7 +600,7 @@ function PMA_getDatabaseTables(
         $html .= 'onmouseover="this.className=\'small_tab_pref2\';" ';
         $html .= 'onmouseout="this.className=\'small_tab_pref\';" ';
         $html .= 'onclick="Start_tab_upd(\''
-            . $GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i] . '\');">';
+            . $GLOBALS['PMD']["TABLE_NAME_SMALL"][$i] . '\');">';
         $html .= '<img alt="" ';
         $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/exec_small.png')
             . '" />';