diff --git a/src/propgrid/manager.cpp b/src/propgrid/manager.cpp
index bc94bb6274..972d062528 100644
--- a/src/propgrid/manager.cpp
+++ b/src/propgrid/manager.cpp
@@ -639,7 +639,8 @@ void wxPropertyGridManager::SetId( wxWindowID winid )
 
 wxSize wxPropertyGridManager::DoGetBestSize() const
 {
-    return wxSize(60,150);
+    // Width: margin=15 + columns=2*40 + scroll bar
+    return wxSize(15+2*40+wxSystemSettings::GetMetric(wxSYS_VSCROLL_X), 150);
 }
 
 // -----------------------------------------------------------------------