diff --git a/ChangeLog b/ChangeLog
index b2636d093..af44e67e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-08 01:19  Chad Hardin <cehardin@mac.com>
+
+	* Source/NSPageLayout.m: Ensure that the units on the panel
+	are set.  Using -viewWithTag:, I had to make sure I called
+	the view immediately above the view I was loking for.
+
 2004-08-08 00:43  Chad Hardin <cehardin@mac.com>
 
 	* config.make.in: Added CUPS specific make variables.
diff --git a/Source/NSPageLayout.m b/Source/NSPageLayout.m
index f33a7163e..c18bf2613 100644
--- a/Source/NSPageLayout.m
+++ b/Source/NSPageLayout.m
@@ -50,6 +50,7 @@
 #include "AppKit/NSPageLayout.h"
 #include "AppKit/NSTableView.h"
 #include "AppKit/NSTabView.h"
+#include "AppKit/NSTabViewItem.h"
 #include "AppKit/NSPrinter.h"
 #include "GSGuiPrivate.h"
 #include "GNUstepGUI/GSPrinting.h"
@@ -501,7 +502,7 @@ enum {
     for( n = 100; n <= 105; n++ )
       {
         NSTextField *textField;
-        textField = [tabView viewWithTag: n];
+        textField = [[[tabView tabViewItemAtIndex:1] view] viewWithTag: n];
         [textField setStringValue: measurementString];
       }
     //doing the above puts selects the 2nd tab, we don't want that.