diff --git a/ChangeLog b/ChangeLog
index b8f41a61d5..932ac9dc51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-09  Sven Neumann  <sven@gimp.org>
+
+	* plug-ins/print/print-page-layout.c: fixed the behavior when
+	changing the unit.
+
 2007-08-08  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/print/print-page-layout.c
diff --git a/plug-ins/print/print-page-layout.c b/plug-ins/print/print-page-layout.c
index 1f10628026..a7b4a7781f 100644
--- a/plug-ins/print/print-page-layout.c
+++ b/plug-ins/print/print-page-layout.c
@@ -678,6 +678,10 @@ print_size_info_center_changed (GtkWidget *combo)
 static void
 print_size_info_center_none (void)
 {
+  /* return early if we are called from a unit change */
+  if (gimp_size_entry_get_unit (info.size_entry) != info.data->unit)
+    return;
+
   info.data->center = CENTER_NONE;
 
   if (info.center_combo)
@@ -741,6 +745,10 @@ print_size_info_offset_max_changed (GtkAdjustment *adj,
 {
   guint index = GPOINTER_TO_INT (data);
 
+  /* return early if we are called from a unit change */
+  if (gimp_size_entry_get_unit (info.size_entry) != info.data->unit)
+    return;
+
   g_signal_handlers_block_by_func (info.size_entry,
                                    print_size_info_size_changed, NULL);