diff --git a/lcl/interfaces/gtk/gtkobject.inc b/lcl/interfaces/gtk/gtkobject.inc
index 75b7a9d3d8..4d7d2d0531 100644
--- a/lcl/interfaces/gtk/gtkobject.inc
+++ b/lcl/interfaces/gtk/gtkobject.inc
@@ -3033,7 +3033,9 @@ begin
                             'focus-out-event', @gtkKillFocusCBAfter);
       end else begin
         ConnectSenderSignal(gCore, 'focus-in-event', @gtkFocusCB);
-        ConnectSenderSignal(gCore, 'focus-out-event', @gtkKillFocusCBAfter);
+        ConnectSenderSignalAfter(gCore, 'focus-in-event', @gtkFocusCBAfter);
+        ConnectSenderSignal(gCore, 'focus-out-event', @gtkKillFocusCB);
+        ConnectSenderSignalAfter(gCore, 'focus-out-event', @gtkKillFocusCBAfter);
       end;
     end;
     
@@ -7061,6 +7063,9 @@ end;
  { =============================================================================
 
   $Log$
+  Revision 1.339  2003/03/25 10:45:41  mattias
+  reduced focus handling and improved focus setting
+
   Revision 1.338  2003/03/18 13:45:39  mattias
   set transient forms with Screen object order