diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 23631aa429..aabf7df031 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,7 @@
+19990804-00:40 EDT Paul Tucker <ptucker@sympatico.ca>
+  * source/rtl/gt/gtwin.c
+   * better selection of default screen size reported by MaxRow/Col
+
 19990804-00:35 EDT David G. Holm <dholm@jsd-llc.com>
   * source/vm/hvm.c
     ! Corrected Power() to set the correct number of decimal points.
diff --git a/harbour/source/rtl/gt/gtwin.c b/harbour/source/rtl/gt/gtwin.c
index c4588a0712..ff573e152e 100644
--- a/harbour/source/rtl/gt/gtwin.c
+++ b/harbour/source/rtl/gt/gtwin.c
@@ -81,7 +81,7 @@ char hb_gt_GetScreenWidth(void)
 
   LOG("GetScreenWidth");
   GetConsoleScreenBufferInfo(HOutput, &csbi);
-  return (char)csbi.dwSize.X;
+  return (char)csbi.dwMaximumWindowSize.X;
 }
 
 char hb_gt_GetScreenHeight(void)
@@ -90,7 +90,7 @@ char hb_gt_GetScreenHeight(void)
 
   LOG("GetScreenHeight");
   GetConsoleScreenBufferInfo(HOutput, &csbi);
-  return (char)csbi.dwSize.Y;
+  return (char)csbi.dwMaximumWindowSize.Y;
 }
 
 void hb_gt_SetPos(char cRow, char cCol)