diff --git a/lcl/interfaces/gtk/gtkobject.inc b/lcl/interfaces/gtk/gtkobject.inc
index 8cc8b83876..e6249451bf 100644
--- a/lcl/interfaces/gtk/gtkobject.inc
+++ b/lcl/interfaces/gtk/gtkobject.inc
@@ -5909,7 +5909,8 @@ begin
   else
     ABorderStyle:=ACustomForm.BorderStyle;
   WindowType:=FormStyleMap[ABorderStyle];
-  if (ABorderStyle=bsNone) and (ACustomForm.FormStyle=fsStayOnTop) then begin
+  if (ABorderStyle=bsNone) and (ACustomForm.FormStyle=fsStayOnTop)
+  and (not (csDesigning in ACustomForm.ComponentState)) then begin
     WindowType:=GTK_WINDOW_POPUP;
   end;
 
@@ -6880,7 +6881,8 @@ begin
 
     if (ACustomForm<>nil) then begin
       If (ACustomForm.BorderStyle <> bsSizeable) or
-        (ACustomForm.FormStyle = fsStayOnTop)
+        ((ACustomForm.FormStyle = fsStayOnTop)
+         and (not (csDesigning in ACustomForm.ComponentState)))
       then begin
         Decor := GetWindowDecorations(ACustomForm);
         Func := GetWindowFunction(ACustomForm);
@@ -9211,6 +9213,9 @@ end;
  { =============================================================================
 
   $Log$
+  Revision 1.507  2004/05/31 08:21:52  mattias
+  fsStayOnTop is now ignored in design mode
+
   Revision 1.506  2004/05/30 14:02:31  mattias
   implemented OnChange for TRadioButton, TCheckBox, TToggleBox and some more docking stuff
 
diff --git a/lcl/interfaces/win32/win32object.inc b/lcl/interfaces/win32/win32object.inc
index 366e562b12..dadd4ef1ad 100644
--- a/lcl/interfaces/win32/win32object.inc
+++ b/lcl/interfaces/win32/win32object.inc
@@ -2058,7 +2058,8 @@ Begin
       Assert(False, 'Trace:CreateComponent - Creating a Form Window');
       Flags := BorderStyleToWin32Flags(TCustomForm(Sender).BorderStyle);
       FlagsEx := BorderStyleToWin32FlagsEx(TCustomForm(Sender).BorderStyle);
-      if TCustomForm(Sender).FormStyle = fsStayOnTop then
+      if (TCustomForm(Sender).FormStyle = fsStayOnTop)
+      and (not (csDesigning in TCustomForm(Sender).ComponentState)) then
         FlagsEx := FlagsEx or WS_EX_TOPMOST;
       pClassName := @ClsName;
       WindowTitle := StrCaption;
@@ -2999,6 +3000,9 @@ End;
 
 {
   $Log$
+  Revision 1.201  2004/05/31 08:21:52  mattias
+  fsStayOnTop is now ignored in design mode
+
   Revision 1.200  2004/05/30 20:17:55  vincents
   changed radiobutton style to BS_RADIOBUTTON to prevent test program from hanging.