diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index a193972da3..306dd35ec9 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -8818,6 +8818,12 @@ wxPen& wxGrid::GetDividerPen() const
 
 void wxGrid::SetCellValue( int row, int col, const wxString& s )
 {
+    if ( s == GetCellValue(row, col) )
+    {
+        // Avoid flicker by not doing anything in this case.
+        return;
+    }
+
     if ( m_table )
     {
         m_table->SetValue( row, col, s );