diff --git a/src/generic/gridsel.cpp b/src/generic/gridsel.cpp
index 25b7a82afd..0288f9a66a 100644
--- a/src/generic/gridsel.cpp
+++ b/src/generic/gridsel.cpp
@@ -128,7 +128,13 @@ void wxGridSelection::SetSelectionMode( wxGrid::wxGridSelectionModes selmode )
             }
 
             if ( !valid )
+            {
+                if ( !m_grid->GetBatchCount() )
+                {
+                    m_grid->RefreshBlock(block.GetTopLeft(), block.GetBottomRight());
+                }
                 m_selection.erase(m_selection.begin() + n);
+            }
         }
 
         m_selectionMode = selmode;