diff --git a/components/tdi/Demo/TDIDemo.lps b/components/tdi/Demo/TDIDemo.lps
index e45e400bd..e02f30dc4 100644
--- a/components/tdi/Demo/TDIDemo.lps
+++ b/components/tdi/Demo/TDIDemo.lps
@@ -12,7 +12,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="8"/>
         <CursorPos X="7" Y="11"/>
-        <UsageCount Value="184"/>
+        <UsageCount Value="187"/>
       </Unit0>
       <Unit1>
         <Filename Value="mainform.pas"/>
@@ -23,7 +23,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="10" Y="8"/>
-        <UsageCount Value="184"/>
+        <UsageCount Value="187"/>
       </Unit1>
       <Unit2>
         <Filename Value="uform1.pas"/>
@@ -35,7 +35,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="76"/>
         <CursorPos X="25" Y="86"/>
-        <UsageCount Value="184"/>
+        <UsageCount Value="187"/>
       </Unit2>
       <Unit3>
         <Filename Value="uform2.pas"/>
@@ -47,7 +47,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="76"/>
         <CursorPos X="18" Y="80"/>
-        <UsageCount Value="106"/>
+        <UsageCount Value="109"/>
       </Unit3>
       <Unit4>
         <Filename Value="umainform.pas"/>
@@ -58,8 +58,8 @@
         <IsVisibleTab Value="True"/>
         <EditorIndex Value="0"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="142"/>
-        <CursorPos X="35" Y="151"/>
+        <TopLine Value="139"/>
+        <CursorPos X="11" Y="144"/>
         <UsageCount Value="90"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -69,8 +69,8 @@
         <UnitName Value="TDIClass"/>
         <EditorIndex Value="1"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="703"/>
-        <CursorPos X="7" Y="710"/>
+        <TopLine Value="697"/>
+        <CursorPos X="14" Y="714"/>
         <UsageCount Value="90"/>
         <Bookmarks Count="6">
           <Item0 X="3" Y="1044" ID="3"/>
@@ -159,7 +159,7 @@
         <EditorIndex Value="2"/>
         <WindowIndex Value="0"/>
         <TopLine Value="28"/>
-        <CursorPos X="19" Y="39"/>
+        <CursorPos X="20" Y="36"/>
         <UsageCount Value="53"/>
         <Loaded Value="True"/>
       </Unit14>
@@ -728,7 +728,7 @@
     <General>
       <ActiveWindowIndexAtStart Value="0"/>
     </General>
-    <JumpHistory Count="25" HistoryIndex="24">
+    <JumpHistory Count="24" HistoryIndex="23">
       <Position1>
         <Filename Value="umainform.pas"/>
         <Caret Line="10" Column="19" TopLine="1"/>
@@ -825,10 +825,7 @@
         <Filename Value="..\tdiclass.pas"/>
         <Caret Line="709" Column="29" TopLine="703"/>
       </Position24>
-      <Position25>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="100" Column="9" TopLine="133"/>
-      </Position25>
     </JumpHistory>
   </ProjectSession>
+  <EditorMacros Count="0"/>
 </CONFIG>
diff --git a/components/tdi/tdiclass.pas b/components/tdi/tdiclass.pas
index 31bf41475..d90b11c9a 100644
--- a/components/tdi/tdiclass.pas
+++ b/components/tdi/tdiclass.pas
@@ -184,7 +184,8 @@ type
     destructor Destroy ; override;
     procedure DoCloseTabClicked(APage: TCustomPage); override;
 
-    procedure CreateFormInNewPage( AFormClass: TFormClass; ImageIndex : Integer = -1 ) ;
+    function CreateFormInNewPage( AFormClass: TFormClass;
+      ImageIndex : Integer = -1 ) : TForm;
     procedure ShowFormInPage( AForm: TForm; ImageIndex : Integer = -1 );
     Function FindFormInPages( AForm: TForm): Integer ;
 
@@ -690,14 +691,12 @@ begin
   FMainMenu := AValue ;
 end ;
 
-procedure TTDINoteBook.CreateFormInNewPage(AFormClass : TFormClass ;
-  ImageIndex : Integer) ;
-Var
-  NewForm : TForm ;
+function TTDINoteBook.CreateFormInNewPage(AFormClass: TFormClass;
+   ImageIndex: Integer): TForm;
 begin
-  NewForm := AFormClass.Create(Application);
+  Result := AFormClass.Create(Application);
 
-  ShowFormInPage( NewForm, ImageIndex );
+  ShowFormInPage( Result, ImageIndex );
 end ;
 
 procedure TTDINoteBook.ShowFormInPage(AForm : TForm ; ImageIndex : Integer) ;