diff --git a/components/spktoolbar/designtime/SpkToolbarEditor.pas b/components/spktoolbar/designtime/SpkToolbarEditor.pas
index c9d8072fa..80a08851b 100644
--- a/components/spktoolbar/designtime/SpkToolbarEditor.pas
+++ b/components/spktoolbar/designtime/SpkToolbarEditor.pas
@@ -268,12 +268,13 @@ begin
   if not(Component is TSpkToolbar) then
     exit;
 
+  if EditWindow = nil then
+    EditWindow := TfrmEditWindow.Create(nil);
   EditWindow.SetData(TSpkToolbar(Component),Self.GetDesigner);
   EditWindow.Show;
 end;
 
 procedure TSpkToolbarEditor.Edit;
-
 begin
   DoOpenContentsEditor;
 end;
@@ -371,11 +372,9 @@ begin
 end;
 
 initialization
-
-EditWindow:=TfrmEditWindow.create(nil);
+  //EditWindow:=TfrmEditWindow.create(nil);
 
 finalization
-
-EditWindow.Free;
+  EditWindow.Free;
 
 end.
diff --git a/components/spktoolbar/designtime/spkte_EditWindow.pas b/components/spktoolbar/designtime/spkte_EditWindow.pas
index 7ca66ff03..514240a2c 100644
--- a/components/spktoolbar/designtime/spkte_EditWindow.pas
+++ b/components/spktoolbar/designtime/spkte_EditWindow.pas
@@ -127,6 +127,9 @@ implementation
 
 {$R *.lfm}
 
+uses
+  IDEWindowIntf;
+
 resourcestring
   RSCannotMoveAboveFirstElement = 'You can not move above the top of the first element!';
   RSCannotMoveBeyondLastElement = 'You can not move beyond the last element!';
@@ -1173,6 +1176,7 @@ begin
   end;
   tbToolbar.ButtonHeight := tbToolbar.Images.Height + 8;
 //  tbToolbar.ButtonWidth := tbToolbar.Images.Width + 8;
+  IDEDialogLayoutList.ApplyLayout(self);
 end;
 
 end.