diff --git a/lcl/interfaces/gtk2/gtk2callback.inc b/lcl/interfaces/gtk2/gtk2callback.inc
index 14dc075689..0cf4b67254 100644
--- a/lcl/interfaces/gtk2/gtk2callback.inc
+++ b/lcl/interfaces/gtk2/gtk2callback.inc
@@ -761,54 +761,7 @@ begin
   Result := HandleGtkKeyUpDown(Widget,Event,Data,false,False,'key-release-event');
 end;
 
-function GTKFocusCB( widget: PGtkWidget; event:PGdkEventFocus;
-  data: gPointer) : GBoolean; cdecl;
-{$IFDEF VerboseFocus}
-var
-  LCLObject: TObject;
-  CurFocusWidget: PGtkWidget;
-{$ENDIF}
-begin
-  {$IFDEF EventTrace}
-  EventTrace('focus', data);
-  {$ENDIF}
-  if (Widget=nil) or (Event=nil) then ;
-  //DebugLn('GTKFocusCB ',DbgSName(TObject(Data)),' ',GetWidgetDebugReport(Widget));
-  {$IFDEF VerboseFocus}
-  write('GTKFocusCB Widget=',DbgS(Widget),' Event^.theIn=',Event^._in);
-  LCLObject:=TObject(data);
-  if LCLObject<>nil then begin
-    if LCLObject is TComponent then begin
-      write(' LCLObject=',TComponent(LCLObject).Name,':',LCLObject.ClassName)
-    end else begin
-      write(' LCLObject=',LCLObject.ClassName)
-    end;
-  end else
-    write(' LCLObject=nil');
-  DebugLn(''); DbgOut('    ');
-  CurFocusWidget:=PGtkWidget(GetFocus);
-  if CurFocusWidget<>nil then begin
-    write(' GetFocus=',DbgS(CurFocusWidget));
-    LCLObject:=GetNearestLCLObject(CurFocusWidget);
-    if LCLObject<>nil then begin
-      if LCLObject is TComponent then begin
-        write(' ParentLCLFocus=',TComponent(LCLObject).Name,':',LCLObject.ClassName)
-      end else begin
-        write(' ParentLCLFocus=',LCLObject.ClassName)
-      end;
-    end else
-      write(' LCLObject=nil');
-  end else begin
-    write(' GetFocus=nil');
-  end;
-  DebugLn('');
-  {$ENDIF}
-
-  Result:=CallBackDefaultReturn;
-end;
-
-function GTKFocusCBAfter(widget: PGtkWidget; event:PGdkEventFocus;
-  data: gPointer) : GBoolean; cdecl;
+function GTKFocusCB(widget: PGtkWidget; event: PGdkEventFocus; data: gPointer): GBoolean; cdecl;
 var
   Mess : TLMessage;
   LCLObject: TObject;
@@ -880,10 +833,11 @@ begin
   UpdateMouseCaptureControl;
 
   //TODO: fill in old focus
-  FillChar(Mess,SizeOf(Mess),0);
+  FillChar(Mess, SizeOf(Mess), 0);
   Mess.msg := LM_SETFOCUS;
   DeliverMessage(Data,  Mess);
-  Result:=true;
+
+  Result := CallBackDefaultReturn;
 end;
 
 function GTKKillFocusCB(widget: PGtkWidget; event:PGdkEventFocus;
diff --git a/lcl/interfaces/gtk2/gtk2proc.pp b/lcl/interfaces/gtk2/gtk2proc.pp
index 8f5fab0502..83b890a34a 100644
--- a/lcl/interfaces/gtk2/gtk2proc.pp
+++ b/lcl/interfaces/gtk2/gtk2proc.pp
@@ -128,8 +128,6 @@ function GTKKeyReleaseAfter(Widget: PGtkWidget; Event: pgdkeventkey;
 
 function GTKFocusCB(widget: PGtkWidget; event:PGdkEventFocus;
                     data: gPointer): GBoolean; cdecl;
-function GTKFocusCBAfter(widget: PGtkWidget; event:PGdkEventFocus;
-                         data: gPointer): GBoolean; cdecl;
 function GTKKillFocusCB(widget: PGtkWidget; event:PGdkEventFocus;
                         data: gPointer): GBoolean; cdecl;
 function GTKKillFocusCBAfter(widget: PGtkWidget; event:PGdkEventFocus;
diff --git a/lcl/interfaces/gtk2/gtk2widgetset.inc b/lcl/interfaces/gtk2/gtk2widgetset.inc
index e8eab22bc6..4c0016ce4f 100644
--- a/lcl/interfaces/gtk2/gtk2widgetset.inc
+++ b/lcl/interfaces/gtk2/gtk2widgetset.inc
@@ -65,19 +65,6 @@ begin
     Result := False;
 end;
 
-function GTK2FocusCBAfter(widget: PGtkWidget; event:PGdkEventFocus;
-  data: gPointer) : GBoolean; cdecl;
-var
-  Status : gBoolean;
-begin
-  Status := GTKFocusCBAfter(Widget, Event, Data);
-
-  if GtkWidgetIsA(Widget,GTK_APIWIDGETCLIENT_TYPE) then
-    Result := Status
-  else
-    Result := False;
-end;
-
 function gtk2HideCB( widget: PGtkWidget; data: gPointer) : GBoolean; cdecl;
 var
    Status : GBoolean;
@@ -397,7 +384,6 @@ procedure TGtk2WidgetSet._SetCallbackEx(const AMsg: LongInt;
   procedure ConnectFocusEvents(const AnObject: PGTKObject);
   begin
     ConnectSenderSignal(AnObject, 'focus-in-event', @gtkFocusCB);
-    ConnectSenderSignalAfter(AnObject, 'focus-in-event', @gtkFocusCBAfter);
     ConnectSenderSignal(AnObject, 'focus-out-event', @gtkKillFocusCB);
     ConnectSenderSignalAfter(AnObject, 'focus-out-event', @gtkKillFocusCBAfter);
   end;
@@ -855,7 +841,6 @@ procedure TGTK2WidgetSet.SetCallbackEx(const AMsg: LongInt;
   begin
     //DebugLn(['ConnectFocusEvents ',GetWidgetDebugReport(PGtkWidget(AnObject))]);
     ConnectSenderSignal(AnObject, 'focus-in-event', @gtk2FocusCB);
-    ConnectSenderSignalAfter(AnObject, 'focus-in-event', @gtk2FocusCBAfter);
     ConnectSenderSignal(AnObject, 'focus-out-event', @gtk2KillFocusCB);
     ConnectSenderSignalAfter(AnObject, 'focus-out-event', @gtk2KillFocusCBAfter);
   end;