diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index c69d269430..2af40dc9c8 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -2048,7 +2048,10 @@ void wxGrid::SetEditControlValue( const wxString& value )
     if ( m_table )
     {
         wxString s;
-        s = ( value == wxEmptyString ? GetCellValue(m_currentCellCoords) : value );
+        if ( !value )
+            s = GetCellValue(m_currentCellCoords);
+        else
+            s = value;
 
         if ( IsTopEditControlEnabled() )
         {