diff --git a/src/kits/tracker/infowindow/AttributesView.cpp b/src/kits/tracker/infowindow/AttributesView.cpp
index 9af7bd96f1..d19e8d9e0e 100644
--- a/src/kits/tracker/infowindow/AttributesView.cpp
+++ b/src/kits/tracker/infowindow/AttributesView.cpp
@@ -472,4 +472,14 @@ AttributesView::AttributesView(Model* model)
 		}
 		fListView->AddRow(row);
 	}
+
+	int32 rows = fListView->CountRows(NULL);
+	if (rows < 5)
+		rows = 5;
+	BRow* first = fListView->RowAt(0, NULL);
+	if (first != NULL) {
+		float height = first->Height() * (rows + 2);
+		SetExplicitMaxSize(BSize(B_SIZE_UNSET, height));
+	}
+
 }
diff --git a/src/kits/tracker/infowindow/FilePermissionsView.cpp b/src/kits/tracker/infowindow/FilePermissionsView.cpp
index 925b219aee..ddecbc5a63 100644
--- a/src/kits/tracker/infowindow/FilePermissionsView.cpp
+++ b/src/kits/tracker/infowindow/FilePermissionsView.cpp
@@ -184,7 +184,7 @@ FilePermissionsView::FilePermissionsView(BRect rect, Model* model)
 	SetLayout(groupLayout);
 
 	BLayoutBuilder::Group<>(groupLayout)
-		.AddGroup(B_HORIZONTAL)
+		.AddGroup(B_HORIZONTAL, B_USE_DEFAULT_SPACING, 0.0f)
 			.SetInsets(B_USE_DEFAULT_SPACING)
 			.AddGrid(B_USE_SMALL_SPACING, B_USE_SMALL_SPACING)
 				.Add(ownerRightLabel, 1, 0)