diff --git a/src/ce_projinspect.lfm b/src/ce_projinspect.lfm
index cb2b6815..0c5109a3 100644
--- a/src/ce_projinspect.lfm
+++ b/src/ce_projinspect.lfm
@@ -54,7 +54,7 @@ inherited CEProjectInspectWidget: TCEProjectInspectWidget
       Width = 416
       OnResize = toolbarResize
       object btnRemFold: TCEToolButton[0]
-        Left = 113
+        Left = 141
         Hint = 'remove the selected source parent folder from the project'
         Top = 0
         AutoSize = True
@@ -64,7 +64,7 @@ inherited CEProjectInspectWidget: TCEProjectInspectWidget
         scaledSeparator = False
       end
       object btnAddFold: TCEToolButton[1]
-        Left = 141
+        Left = 113
         Hint = 'add a folder of sources to the project'
         Top = 0
         AutoSize = True
@@ -100,11 +100,9 @@ inherited CEProjectInspectWidget: TCEProjectInspectWidget
         Top = 2
         Width = 232
         ButtonWidth = 28
-        NumGlyphs = 1
         Align = alClient
-        Anchors = [akTop, akLeft, akRight]
-        BorderSpacing.Left = 142
         BorderSpacing.Around = 2
+        NumGlyphs = 1
         MaxLength = 0
         TabOrder = 0
         FilteredTreeview = Tree
diff --git a/src/ce_projinspect.pas b/src/ce_projinspect.pas
index 8431e6bd..10e7a70a 100644
--- a/src/ce_projinspect.pas
+++ b/src/ce_projinspect.pas
@@ -90,7 +90,7 @@ implementation
 {$R *.lfm}
 
 const optFname = 'projinspect.txt';
-const filterAlign: array[boolean] of integer = (66, 174);
+const filterAlign: array[boolean] of integer = (58, 162);
 
 {$REGION Standard Comp/Obj------------------------------------------------------}
 constructor TCEProjectInspectWidget.create(aOwner: TComponent);
@@ -317,15 +317,24 @@ end;
 procedure TCEProjectInspectWidget.updateButtons;
 var
   ce: boolean;
+  sp: integer;
 begin
   ce := fProject.getFormat = pfCE;
-  btnRemFile.Visible:= ce;
+
   btnRemFold.Visible:= ce;
-  btnAddFile.Visible:= ce;
   btnAddFold.Visible:= ce;
-  toolbarResize(nil);
-  TreeFilterEdit1.BorderSpacing.Left := ScaleX(filterAlign[ce], 96);
-  toolbarResize(nil);
+  btnRemFile.Visible:= ce;
+  btnAddFile.Visible:= ce;
+
+  TreeFilterEdit1.Left := toolbar.Width - 5;
+  sp := scaleX(2, 96);
+  if ce then
+    TreeFilterEdit1.Left  := btnRemFold.Left + btnRemFold.Width + 2
+  else
+    TreeFilterEdit1.Left  := btnTree.Left + btnRemFold.Width + 2;
+  TreeFilterEdit1.width := toolbar.Width - TreeFilterEdit1.Left - sp;
+  TreeFilterEdit1.top   := sp;
+  TreeFilterEdit1.Height:= toolbar.Height - sp * 2;
 end;
 
 procedure TCEProjectInspectWidget.setFileListAsTree(value: boolean);