diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index 67ac880631..55a33034f9 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -2165,7 +2165,7 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
 
     wxPGProperty* nextP = visPropArray[0];
 
-    int gridWidth = state->GetVirtualWidth();
+    int gridWidth = itemsRect->x + itemsRect->width;
 
     // Calculate splitters positions
     wxVector<int> splitterPos;
@@ -2501,6 +2501,11 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
         y += rowHeight;
     }
 
+    // Clear empty space beyond the right edge of the grid
+    dc.SetPen(wxPen(m_colEmptySpace));
+    dc.SetBrush(wxBrush(m_colEmptySpace));
+    dc.DrawRectangle(cellX, firstItemTopY, gridWidth - cellX, lastItemBottomY - firstItemTopY);
+
     return y - 1  + vy;
 }