diff --git a/ChangeLog b/ChangeLog
index 4318e2058..bf3c6d1c1 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,8 @@ $Source$
     * tbl_change.php: Fix wrong path to image.
     * tbl_properties_operations.php: Define sort order for sorting tables 
       (RFE #971314).
+    * libraries/common.lib.php: On error show edit link with table context if
+      possible.
 
 2004-06-15 Alexander M. Turek  <me@derrabus.de>
     * libraries/config_import.lib.php: The default settings should be merged.
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index d0a24e193..07ab4756b 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -615,7 +615,11 @@ if ($is_minimum_common == FALSE) {
                 echo PMA_showMySQLDocu('Reference', 'SELECT');
             }
             if ($is_modify_link && isset($db)) {
-                $doedit_goto = '<a href="db_details.php?' . PMA_generate_common_url($GLOBALS['db']) . '&amp;sql_query=' . urlencode($the_query) . '&amp;show_query=1">';
+                if (isset($table)) {
+                    $doedit_goto = '<a href="tbl_properties.php?' . PMA_generate_common_url($db, $table) . '&amp;sql_query=' . urlencode($the_query) . '&amp;show_query=1">';
+                } else {
+                    $doedit_goto = '<a href="db_details.php?' . PMA_generate_common_url($db) . '&amp;sql_query=' . urlencode($the_query) . '&amp;show_query=1">';
+                }
                 if ($GLOBALS['cfg']['PropertiesIconic']) {
                     echo $doedit_goto 
                        . '<img src=" '. $GLOBALS['pmaThemeImage'] . 'b_edit.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="' . $GLOBALS['strEdit'] .'" />'