diff --git a/src/kits/tracker/ContainerWindow.cpp b/src/kits/tracker/ContainerWindow.cpp
index 526d94468f..7357397b39 100644
--- a/src/kits/tracker/ContainerWindow.cpp
+++ b/src/kits/tracker/ContainerWindow.cpp
@@ -1352,6 +1352,10 @@ 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;
+
 	// make sure entire window fits on screen
 	frame = frame & screenFrame;