diff --git a/ChangeLog b/ChangeLog
index 8fa22baf6a..b24ca57e54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,13 @@
 	* .../business-gnome/glade/vendor.glade:
 	* .../business-gnome/glade/employee.glade:
 	  Add ability to edit currency in the UI.  Fixes #101001
+
+	* .../business-ledger/gncEntryLedgerLayout.c: change the order
+	  of columns in order to get page-up/page-down to work without going
+	  into an infinite loop.
+	* .../business-ledger/gncEntryLedgerLoad.c: suspend events
+	  when we're creating a new entry.  Unfortunately the gnucash-sheet
+	  still never counts the blank entry, and I don't know why.
 	
 2003-01-12  David Hampton  <hampton@employees.org>
 
diff --git a/src/business/business-gnome/dialog-invoice.c b/src/business/business-gnome/dialog-invoice.c
index b868664f14..3b6df25b52 100644
--- a/src/business/business-gnome/dialog-invoice.c
+++ b/src/business/business-gnome/dialog-invoice.c
@@ -1828,7 +1828,7 @@ gnc_invoice_new_window (GNCBook *bookp, InvoiceDialogType type,
   }
 
   gnc_table_realize_gui (gnc_entry_ledger_get_table (entry_ledger));
-
+ 
   /* Show the dialog */
   gtk_widget_show_all (iw->dialog);
 
diff --git a/src/business/business-ledger/gncEntryLedgerLayout.c b/src/business/business-ledger/gncEntryLedgerLayout.c
index 05c5ef0134..8ecedcd797 100644
--- a/src/business/business-ledger/gncEntryLedgerLayout.c
+++ b/src/business/business-ledger/gncEntryLedgerLayout.c
@@ -143,8 +143,8 @@ static void gnc_entry_ledger_set_cells (GncEntryLedger *ledger,
   case GNCENTRY_INVOICE_VIEWER:
 
     curs = gnc_table_layout_get_cursor (layout, "cursor");
-    gnc_table_layout_set_cell (layout, curs, ENTRY_INV_CELL, 0, 0);
-    gnc_table_layout_set_cell (layout, curs, ENTRY_DATE_CELL, 0, 1);
+    gnc_table_layout_set_cell (layout, curs, ENTRY_DATE_CELL, 0, 0);
+    gnc_table_layout_set_cell (layout, curs, ENTRY_INV_CELL, 0, 1);
     gnc_table_layout_set_cell (layout, curs, ENTRY_DESC_CELL, 0, 2);
     gnc_table_layout_set_cell (layout, curs, ENTRY_ACTN_CELL, 0, 3);
     gnc_table_layout_set_cell (layout, curs, ENTRY_IACCT_CELL, 0, 4);
@@ -165,8 +165,8 @@ static void gnc_entry_ledger_set_cells (GncEntryLedger *ledger,
   case GNCENTRY_BILL_VIEWER:
 
     curs = gnc_table_layout_get_cursor (layout, "cursor");
-    gnc_table_layout_set_cell (layout, curs, ENTRY_INV_CELL, 0, 0);
-    gnc_table_layout_set_cell (layout, curs, ENTRY_DATE_CELL, 0, 1);
+    gnc_table_layout_set_cell (layout, curs, ENTRY_DATE_CELL, 0, 0);
+    gnc_table_layout_set_cell (layout, curs, ENTRY_INV_CELL, 0, 1);
     gnc_table_layout_set_cell (layout, curs, ENTRY_DESC_CELL, 0, 2);
     gnc_table_layout_set_cell (layout, curs, ENTRY_ACTN_CELL, 0, 3);
     gnc_table_layout_set_cell (layout, curs, ENTRY_BACCT_CELL, 0, 4);
diff --git a/src/business/business-ledger/gncEntryLedgerLoad.c b/src/business/business-ledger/gncEntryLedgerLoad.c
index 191844c3d9..45d41b66ba 100644
--- a/src/business/business-ledger/gncEntryLedgerLoad.c
+++ b/src/business/business-ledger/gncEntryLedgerLoad.c
@@ -16,6 +16,7 @@
 #include "combocell.h"
 #include "messages.h"
 #include "global-options.h"
+#include "gnc-component-manager.h"
 
 #include "gncEntry.h"
 #include "gncEntryLedger.h"
@@ -179,10 +180,15 @@ void gnc_entry_ledger_load (GncEntryLedger *ledger, GList *entry_list)
     case GNCENTRY_ORDER_ENTRY:
     case GNCENTRY_INVOICE_ENTRY:
     case GNCENTRY_BILL_ENTRY:
+
+      gnc_suspend_gui_refresh ();
+
       blank_entry = gncEntryCreate (ledger->book);
       gncEntrySetDate (blank_entry, ledger->last_date_entered);
       ledger->blank_entry_guid = *gncEntryGetGUID (blank_entry);
 
+      gnc_resume_gui_refresh ();
+
       {
 	GncOwner *owner = gncInvoiceGetOwner (ledger->invoice);
 	GncTaxTable *table;
@@ -246,6 +252,7 @@ void gnc_entry_ledger_load (GncEntryLedger *ledger, GList *entry_list)
 	  gncEntrySetBillTaxIncluded (blank_entry, taxincluded);
 	}
       }
+
       break;
     default:
       ledger->blank_entry_guid = *xaccGUIDNULL ();