diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index f6b7244760..566f0a8102 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -6217,6 +6217,12 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
                 {
                     if (!m_table->IsEmptyCell(row + l, j))
                     {
+                        int numRows, numCols;
+                        if ( GetCellSize(row + l, j, &numRows, &numCols)
+                                 == wxGrid::CellSpan_Inside )
+                            // As above: don't bother drawing inside cells.
+                            continue;
+
                         if ( GetCellAttrPtr(row + l, j)->CanOverflow() )
                         {
                             wxGridCellCoords cell(row + l, j);