diff --git a/src/kits/tracker/ContainerWindow.cpp b/src/kits/tracker/ContainerWindow.cpp
index 7357397b39..f6f77bd2f4 100644
--- a/src/kits/tracker/ContainerWindow.cpp
+++ b/src/kits/tracker/ContainerWindow.cpp
@@ -1352,9 +1352,11 @@ BContainerWindow::ResizeToFit()
 	frame.right = frame.left + extent.Width() + widthDiff;
 	frame.bottom = frame.top + extent.Height() + heightDiff;
 
-	// add some padding to the right and bottom
-	frame.right += be_control_look->DefaultItemSpacing() * 2;
-	frame.bottom += be_control_look->DefaultItemSpacing() * 2;
+	if (PoseView()->ViewMode() == kListMode) {
+		// add some padding to the right and bottom
+		frame.right += 16;
+		frame.bottom += 16;
+	}
 
 	// make sure entire window fits on screen
 	frame = frame & screenFrame;