diff --git a/ide/main.pp b/ide/main.pp
index fe27f54df6..bcfbc86890 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -1283,7 +1283,6 @@ begin
   end;
   ExternalTools.OnNeedsOutputFilter := @OnExtToolNeedsOutputFilter;
   ExternalTools.OnFreeOutputFilter := @OnExtToolFreeOutputFilter;
-  IDEWindowCreators.OnShowForm:=@IDEWindowCreators.SimpleLayoutStorage.ApplyAndShow;
   UpdateDefaultPascalFileExtensions;
 
   EditorOpts := TEditorOptions.Create;
@@ -1524,7 +1523,6 @@ begin
   FreeThenNil(MiscellaneousOptions);
   FreeThenNil(EditorOpts);
   FreeThenNil(DebuggerOptions);
-  IDEWindowCreators.OnShowForm:=nil;
   FreeThenNil(EnvironmentOptions);
   FreeThenNil(IDECommandScopes);
 
diff --git a/ideintf/idewindowintf.pas b/ideintf/idewindowintf.pas
index d7d4cbca04..60abefc6e2 100644
--- a/ideintf/idewindowintf.pas
+++ b/ideintf/idewindowintf.pas
@@ -326,8 +326,6 @@ type
     procedure CreateForm(var AForm; AFormClass: TCustomFormClass;
                          DoDisableAutoSizing: boolean; TheOwner: TComponent); // utility function to create a form with delayed autosizing
 
-    property OnShowForm: TShowIDEWindowEvent read FOnShowForm write FOnShowForm; // set by the IDE to implement a default
-
     property SimpleLayoutStorage: TSimpleWindowLayoutList read FSimpleLayoutStorage;
     procedure RestoreSimpleLayout;
   end;
@@ -1473,12 +1471,8 @@ begin
   and (FindWithName(AForm.Name)<>nil) then
     // show dockable if it has a creator and is not a designer form
     IDEDockMaster.ShowForm(AForm,BringToFront)
-  else if Assigned(OnShowForm) then
-    OnShowForm(Self,AForm,BringToFront)
-  else if BringToFront then
-    AForm.ShowOnTop
   else
-    AForm.Visible:=true;
+    SimpleLayoutStorage.ApplyAndShow(Self,AForm,BringToFront);
 end;
 
 function TIDEWindowCreatorList.ShowForm(AFormName: string; BringToFront: boolean