diff --git a/ChangeLog b/ChangeLog
index 3981258dc1..4ddc6dfc7d 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ $Source$
 
 2002-12-18 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_select.php3, bug 648263
+    * libraries/common.lib.php3, bug 653764
 
 2002-12-17 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/russian: update, thanks to Nicolay Zakharov
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index 715b368eb2..48591e7d2d 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -2,7 +2,7 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
-
+error_reporting(E_ALL);
 /**
  * Misc stuff and functions used by almost all the scripts.
  * Among other things, it contains the advanced authentification work.
@@ -1174,14 +1174,18 @@ if (typeof(document.getElementById) != 'undefined'
             }
 
             // Prepares links that may be displayed to edit/explain the query
+            // (don't go to default pages, we must go to the page
+            // where the query box is available)
+            // (also, I don't see why we should check the goto variable)
 
-            if (!isset($GLOBALS['goto'])) {
-                $edit_target = (isset($GLOBALS['table'])) ? $cfg['DefaultTabTable'] : $cfg['DefaultTabDatabase'];
-            } else if ($GLOBALS['goto'] != 'main.php3') {
-                $edit_target = $GLOBALS['goto'];
-            } else {
-                $edit_target = '';
-            }
+            //if (!isset($GLOBALS['goto'])) {
+                //$edit_target = (isset($GLOBALS['table'])) ? $cfg['DefaultTabTable'] : $cfg['DefaultTabDatabase'];
+            $edit_target = (isset($GLOBALS['table'])) ? 'tbl_properties.php3' : 'db_details.php3';
+            //} else if ($GLOBALS['goto'] != 'main.php3') {
+            //    $edit_target = $GLOBALS['goto'];
+            //} else {
+            //    $edit_target = '';
+            //}
 
             if (isset($cfg['SQLQuery']['Edit'])
                 && ($cfg['SQLQuery']['Edit'] == TRUE )