diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 09ee3112b5..bb4c17c389 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,16 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-06-13 13:56 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+   * source/rtl/gtwvt/gtwvt.c
+     ! Fixed window trashing for tall/wide windows where the 
+       content cannot fill the entire window client area.
+     ; There is still a great amount of flickering, while doing 
+       the resize. I wonder if there is any solution for this 
+       besides turning off full-content drag/resize. Anyways 
+       it's only really bad when trying insane sizes, so it's 
+       not a big problem for normal usage.
+
 2008-06-13 22:24 UTC+0800 Pritpal Bedi (pritpal@vouchcac.com)
    * harbour/source/rtl/gtwvt/gtwvt.c
    * harbour/source/rtl/gtwvt/gtwvt.h
diff --git a/harbour/source/rtl/gtwvt/gtwvt.c b/harbour/source/rtl/gtwvt/gtwvt.c
index 8a275a0148..f83c747515 100644
--- a/harbour/source/rtl/gtwvt/gtwvt.c
+++ b/harbour/source/rtl/gtwvt/gtwvt.c
@@ -569,6 +569,14 @@ static void hb_gt_wvt_FitSize( PHB_GTWVT pWVT )
             SetWindowPos( pWVT->hWnd, NULL, left, top, width, height, SWP_NOZORDER );
             HB_GTSELF_EXPOSEAREA( pWVT->pGT, 0, 0, pWVT->ROWS, pWVT->COLS );
          }
+         else
+         {
+            width  = ( ( USHORT ) ( pWVT->PTEXTSIZE.x * pWVT->COLS ) ) + borderWidth;
+            height = ( ( USHORT ) ( pWVT->PTEXTSIZE.y * pWVT->ROWS ) ) + borderHeight;
+
+            SetWindowPos( pWVT->hWnd, NULL, 0, 0, width, height, SWP_NOZORDER | SWP_NOMOVE );
+            HB_GTSELF_EXPOSEAREA( pWVT->pGT, 0, 0, pWVT->ROWS, pWVT->COLS );
+         }
       }
    }
 }