diff --git a/ChangeLog b/ChangeLog
index 6875ff79b..38e8eea87 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,7 @@ $Source$
     * libraries/get_foreign.lib.php: Free temporary query result.
     * lang/czech: Improve some translations.
     * sql.php: We need bookmark code to be included everytime.
+    * libraries/common.lib.php: Allow editing of query without database.
 
 2005-10-13 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * left.php: preselect db if only one db
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index f5a0f33b9..ef6112341 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2003,7 +2003,7 @@ if (typeof(document.getElementById) != 'undefined'
 
             //if (!isset($GLOBALS['goto'])) {
                 //$edit_target = (isset($GLOBALS['table'])) ? $cfg['DefaultTabTable'] : $cfg['DefaultTabDatabase'];
-            $edit_target = isset($GLOBALS['db']) ? (isset($GLOBALS['table']) ? 'tbl_properties.php' : 'db_details.php') : '';
+            $edit_target = isset($GLOBALS['db']) ? (isset($GLOBALS['table']) ? 'tbl_properties.php' : 'db_details.php') : 'server_sql.php';
             //} else if ($GLOBALS['goto'] != 'main.php') {
             //    $edit_target = $GLOBALS['goto'];
             //} else {