diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b84c685d6e..061221e03f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,12 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-04-13 17:38 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+   * harbour/source/rtl/tget.prg
+     ! Get method UpdateBuffer() fixed to be effective only 
+       when the object has focus (as per the C52 docs and 
+       Lorenzo's report).
+
 2007-04-13 12:18 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
    * harbour/source/debug/debugger.prg
      ! Fixed a few compile errors.
diff --git a/harbour/source/rtl/tget.prg b/harbour/source/rtl/tget.prg
index a501998f57..53e01b2ea5 100644
--- a/harbour/source/rtl/tget.prg
+++ b/harbour/source/rtl/tget.prg
@@ -135,7 +135,7 @@ CLASS Get
    METHOD SetFocus()
    METHOD Undo()
    METHOD UnTransform( cBuffer )
-   METHOD UpdateBuffer() INLINE  ::buffer := ::PutMask( ), iif(::lEdit, ::Assign(),), ::Display(), Self
+   METHOD UpdateBuffer()
 
    METHOD VarGet()
    METHOD VarPut(xValue, lReFormat)
@@ -369,6 +369,24 @@ return Self
 
 //---------------------------------------------------------------------------//
 
+METHOD UpdateBuffer() CLASS Get
+
+   if ::hasFocus
+
+      ::buffer := ::PutMask()
+
+      IF ::lEdit
+         ::Assign()
+      ENDIF
+
+      ::Display()
+
+   endif
+
+return Self
+
+//---------------------------------------------------------------------------//
+
 METHOD Display( lForced ) CLASS Get
 
    local nOldCursor := SetCursor( SC_NONE )
@@ -1215,7 +1233,6 @@ METHOD PutMask( xValue, lEdit ) CLASS Get
    local nFor
    local nNoEditable := 0
 
-
    if ::cType == NIL
       //not initialized yet
       ::Original := ::VarGet()