diff --git a/lcl/interfaces/gtk/gtk1memostrings.inc b/lcl/interfaces/gtk/gtk1memostrings.inc
index 6d5e62d8d1..85527a72a1 100644
--- a/lcl/interfaces/gtk/gtk1memostrings.inc
+++ b/lcl/interfaces/gtk/gtk1memostrings.inc
@@ -16,22 +16,6 @@
 }
 
 //////// Callbacks   //////
-type
-PFreezeRec = ^TFreezeRec;
-TFreezeRec = record
-  GtkText: PGtkText;
-  NewCursorPos: Integer;
-end;
-
-function GtkWS_GtkTextUnFreeze(Freeze: PFreezeRec): guint; cdecl;
-begin
-  gtk_text_thaw(Freeze^.GtkText);
-  if Freeze^.NewCursorPos <> -1 then
-    gtk_editable_set_position(PGtkEditable(Freeze^.GtkText), Freeze^.NewCursorPos);
-  Dispose(Freeze);
-  Result := 0;
-end;
-
 procedure GtkWS_GtkTextInserting(GtkEditable: PGtkEditable; NewText: pgchar;
   NewTextLength: gint; position: pgint; TextInserted:
   PGtkTextInsertEvent); cdecl;
@@ -213,6 +197,21 @@ begin
  Result := X;
 end;
 
+procedure TGtkMemoStrings.SetUpdateState(Updating: Boolean);
+begin
+  inherited SetUpdateState(Updating);
+  //DebugLn(['TGtkMemoStrings.SetUpdateState Updating=',Updating,' ',FGtkText<>nil,' FFreezed=',FFreezed]);
+  if Updating and (FGtkText<>nil) and (not FFreezed) then begin
+    gtk_text_freeze(FGtkText);
+    FFreezed:=true;
+  end;
+  if (not Updating) and (FFreezed) then begin
+    if FGtkText<>nil then
+      gtk_text_thaw(FGtkText);
+    FFreezed:=false;
+  end;
+end;
+
 constructor TGtkMemoStrings.Create(GtkText: PGtkText; TheOwner: TWinControl);
 begin
   inherited Create;
@@ -279,16 +278,11 @@ var
   LineStart: Integer;
   NewLine: String;
   NeedMoveCursor: Boolean;
-  Freeze: PFreezeRec;
+  LocalFreeze: Boolean;
 begin
-  Freeze := nil;
-  if FGtkText^.freeze_count = 0 then begin
+  LocalFreeze:=FGtkText^.freeze_count = 0;
+  if LocalFreeze then
     gtk_text_freeze(FGtkText);
-    New(Freeze);
-    Freeze^.GtkText := FGtkText;
-    Freeze^.NewCursorPos := -1;
-    gtk_idle_add(TGtkfunction(@GtkWS_GtkTextUnFreeze), Freeze);
-  end;
 
   LockOnChange(PGtkObject(FGtkText),+1);
 
@@ -313,8 +307,11 @@ begin
   end;
 
   // when we are thawed out we will move the cursor
-  if NeedMoveCursor and (Freeze <> nil) then
-    Freeze^.NewCursorPos := LineStart;
+  if LocalFreeze then begin
+    gtk_text_thaw(FGtkText);
+    if NeedMoveCursor and (LineStart <> -1) then
+      gtk_editable_set_position(PGtkEditable(FGtkText), LineStart);
+  end;
 
   LockOnChange(PGtkObject(FGtkText),-1);
 end;
diff --git a/lcl/interfaces/gtk/gtk1memostringsh.inc b/lcl/interfaces/gtk/gtk1memostringsh.inc
index 38d53e1d39..34283f429c 100644
--- a/lcl/interfaces/gtk/gtk1memostringsh.inc
+++ b/lcl/interfaces/gtk/gtk1memostringsh.inc
@@ -27,6 +27,7 @@ type
   TGtkMemoStrings = class(TStrings)
   private
     FGtkText : PGtkText;
+    FFreezed: boolean;
     FOwner: TWinControl;
     fTextInsertEvent: TGtkTextInsertEvent;
     fTextDeleteEvent: TGtkTextDeleteEvent;
@@ -46,6 +47,7 @@ type
     procedure TextInserted(NewText: pgchar; NewTextLength: gint; position: pgint);
     procedure TextDeleted(StartPos, EndPos: gint);
     function PositionToLine(Position: Integer; StartLine: Integer = 0): Integer;
+    procedure SetUpdateState(Updating: Boolean); override;
     //procedure SetSorted(Val : boolean); virtual;
   public
     constructor Create(GtkText : PGtkText; TheOwner: TWinControl);