diff --git a/ChangeLog b/ChangeLog
index bb48e1488a..9faacae370 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-05-20  Dave Peticolas  <peticola@cs.ucdavis.edu>
 
+	* src/gnome/window-register.c (gnc_register_sort): just sort by the
+	given key and then by the standard order.
+
 	* src/gnome/window-reconcile.c: add menus to change the sort order
 	of the debits and credits list.
 
diff --git a/src/gnome/window-register.c b/src/gnome/window-register.c
index 80f3d3d7ec..d58d28c880 100644
--- a/src/gnome/window-register.c
+++ b/src/gnome/window-register.c
@@ -332,7 +332,7 @@ gnc_register_sort(RegWindow *regData, sort_type_t sort_code)
       xaccQuerySetSortOrder(query, BY_STANDARD, BY_NONE, BY_NONE);
       break;
     case BY_DATE:
-      xaccQuerySetSortOrder(query, BY_DATE, BY_NUM, BY_AMOUNT);
+      xaccQuerySetSortOrder(query, BY_DATE, BY_STANDARD, BY_NONE);
       break;
     case BY_DATE_ENTERED:
       xaccQuerySetSortOrder(query, BY_DATE_ENTERED, BY_STANDARD, BY_NONE);
@@ -342,16 +342,16 @@ gnc_register_sort(RegWindow *regData, sort_type_t sort_code)
                             BY_STANDARD);
       break;
     case BY_NUM:
-      xaccQuerySetSortOrder(query, BY_NUM, BY_DATE, BY_AMOUNT);
+      xaccQuerySetSortOrder(query, BY_NUM, BY_STANDARD, BY_NONE);
       break;
     case BY_AMOUNT:
-      xaccQuerySetSortOrder(query, BY_AMOUNT, BY_DATE, BY_NUM);
+      xaccQuerySetSortOrder(query, BY_AMOUNT, BY_STANDARD, BY_NONE);
       break;
     case BY_MEMO:
-      xaccQuerySetSortOrder(query, BY_MEMO, BY_DATE, BY_NUM);
+      xaccQuerySetSortOrder(query, BY_MEMO, BY_STANDARD, BY_NONE);
       break;
     case BY_DESC:
-      xaccQuerySetSortOrder(query, BY_DESC, BY_DATE, BY_NUM);
+      xaccQuerySetSortOrder(query, BY_DESC, BY_STANDARD, BY_NONE);
       break;
     default:
       assert(0); /* we should never be here */
diff --git a/src/messages_i18n.h b/src/messages_i18n.h
index b83c95c394..c59bac93f4 100644
--- a/src/messages_i18n.h
+++ b/src/messages_i18n.h
@@ -290,17 +290,17 @@
 #define TOOLTIP_SHOW_ALL        _(TOOLTIP_SHOW_ALL_N)
 #define TOOLTIP_SINGLE_LINE_N  N_("Show transactions on single lines")
 #define TOOLTIP_SINGLE_LINE     _(TOOLTIP_SINGLE_LINE_N)
-#define TOOLTIP_SORT_BY_AMNT_N N_("Sort by Amount, then Date, then Num")
+#define TOOLTIP_SORT_BY_AMNT_N N_("Sort by Amount")
 #define TOOLTIP_SORT_BY_AMNT    _(TOOLTIP_SORT_BY_AMNT_N)
-#define TOOLTIP_SORT_BY_DATE_N N_("Sort by Date, then Num, then Amount")
+#define TOOLTIP_SORT_BY_DATE_N N_("Sort by Date")
 #define TOOLTIP_SORT_BY_DATE    _(TOOLTIP_SORT_BY_DATE_N)
-#define TOOLTIP_SORT_BY_DESC_N N_("Sort by Description, then Date, then Num")
+#define TOOLTIP_SORT_BY_DESC_N N_("Sort by Description")
 #define TOOLTIP_SORT_BY_DESC    _(TOOLTIP_SORT_BY_DESC_N)
 #define TOOLTIP_SORT_BY_ENTERED_N N_("Sort by the date of entry")
 #define TOOLTIP_SORT_BY_ENTERED    _(TOOLTIP_SORT_BY_ENTERED_N)
-#define TOOLTIP_SORT_BY_MEMO_N N_("Sort by Memo, then Date, then Num")
+#define TOOLTIP_SORT_BY_MEMO_N N_("Sort by Memo")
 #define TOOLTIP_SORT_BY_MEMO    _(TOOLTIP_SORT_BY_MEMO_N)
-#define TOOLTIP_SORT_BY_NUM_N  N_("Sort by Num, then Date, then Amount")
+#define TOOLTIP_SORT_BY_NUM_N  N_("Sort by Num")
 #define TOOLTIP_SORT_BY_NUM     _(TOOLTIP_SORT_BY_NUM_N)
 #define TOOLTIP_SORT_BY_STMT_N N_("Sort by the statement date "\
                                   "(unreconciled items last")