diff --git a/src/kits/tracker/FindPanel.cpp b/src/kits/tracker/FindPanel.cpp
index 0b62c9e715..ddfacb7eb0 100644
--- a/src/kits/tracker/FindPanel.cpp
+++ b/src/kits/tracker/FindPanel.cpp
@@ -863,15 +863,16 @@ FindPanel::FindPanel(BFile* node, FindWindow* parent, bool fromTemplate,
 		.SetInsets(B_USE_WINDOW_SPACING)
 		.Add(queryBox)
 		.AddGroup(B_HORIZONTAL, B_USE_DEFAULT_SPACING)
-			.Add(icon)
 			.AddGroup(B_VERTICAL)
-				.AddGroup(B_HORIZONTAL)
-					.Add(fLatch)
-					.Add(new BSeparatorView(B_HORIZONTAL, B_PLAIN_BORDER))
-					.End()
+				.Add(fLatch)
 				.Add(fMoreOptions)
-				.End()
-			.Add(button)
+				.AddGlue()
+			.End()
+			.AddGlue()
+			.AddGroup(B_VERTICAL)
+				.AddGlue()
+				.Add(icon)
+				.Add(button)
 			.End();
 
 	if (initialMode != kByAttributeItem)