diff --git a/ChangeLog b/ChangeLog
index 40efb7b3e..38b8fac25 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-06-20 Robin Johnson  <robbat2@users.sourceforge.net>
+    * tbl_qbe.php3: Using * for tables fields disables 
+      sorting for that field (Fix for bug #570698)
+
 2002-06-20 Marc Delisle  <lem9@users.sourceforge.net>
     * ChangeLog_till_2.2.6.gz removed from the distribution and copied
       to home page
diff --git a/tbl_qbe.php3 b/tbl_qbe.php3
index d0d5d9877..b1b5fafe7 100755
--- a/tbl_qbe.php3
+++ b/tbl_qbe.php3
@@ -258,6 +258,14 @@ for ($x = 0; $x < $col; $x++) {
                 <option value=""></option>
     <?php
     echo "\n";
+
+    // if they have chosen all fields using the * selector,
+    // then sorting is not available
+    // Robbat2 - Fix for Bug #570698
+    if (isset($Sort[$x]) && isset($Field[$x]) && (substr(urldecode($Field[$x]),-2) == '.*')) {
+        $Sort[$x] = '';
+    } //end if
+
     if (isset($Sort[$x]) && $Sort[$x] == 'ASC') {
         $curSort[$z] = $Sort[$x];
         $sel         = ' selected="selected"';
@@ -1014,8 +1022,13 @@ for ($x = 0; $x < $col; $x++) {
         $qry_orderby  .=  ', ';
     }
     if (!empty($curField[$x]) && !empty($curSort[$x])) {
-        $qry_orderby  .=  $curField[$x] . ' ' . $curSort[$x];
-        $last_orderby = 1;
+        // if they have chosen all fields using the * selector,
+        // then sorting is not available
+        // Robbat2 - Fix for Bug #570698
+        if(substr($curField[$x],-2) != '.*')
+        {   $qry_orderby  .=  $curField[$x] . ' ' . $curSort[$x];
+            $last_orderby = 1;
+            }
     }
 } // end for
 if (!empty($qry_orderby)) {