diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2aa741c014..963cf234f8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-21 14:30 UTC-0400 David G. Holm <dholm@jsd-llc.com>
+
+  * source/rtl/tget.prg
+    ! In METHOD KillFocus(), don't call ::Display() until after clearing
+      ::hasFocus. Per bug report from "Robert Haley" <rhaley@cheshire.net>
+
 2001-05-21 08:30 GMT -3 Luiz Rafael Culik <culik@sl.conex.net>
    * source/rtl/gtapi.c
      * fixed an small bug on hb_gtBoxD() reported by Jacek Kaleta
diff --git a/harbour/source/rtl/tget.prg b/harbour/source/rtl/tget.prg
index 8c70a5ce92..4480c21dfd 100644
--- a/harbour/source/rtl/tget.prg
+++ b/harbour/source/rtl/tget.prg
@@ -401,12 +401,13 @@ return Self
 METHOD KillFocus() CLASS Get
 
    ::Assign()
-   ::Display()
 
    ::buffer   := ::PutMask()
    ::hasfocus := .f.
    ::pos      := NIL
 
+   ::Display()
+
 return Self
 
 //---------------------------------------------------------------------------//