diff --git a/docs/changes.txt b/docs/changes.txt
index b03ffea5d2..1a2f2fae30 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -103,6 +103,7 @@ All (GUI):
 - Support wxDP_ALLOWNONE style in generic wxDatePickerCtrl version.
 - Set wxKeyEvent::m_uniChar correctly in the events generated by generic
   wxListCtrl (Mikkel S).
+- Fix changing size of merged cells in wxGrid (Laurent Humbertclaude).
 - Fixed wrapping bug in wxRichTextCtrl when there were images present;
   now sets the cursor to the next line after pressing Shift+Enter.
 
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 1571c5aacf..63af0bd405 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -10277,7 +10277,7 @@ void wxGrid::SetCellSize( int row, int col, int num_rows, int num_cols )
                       wxT("wxGrid::SetCellSize setting cell size to < 1"));
 
         // if this was already a multicell then "turn off" the other cells first
-        if ((cell_rows > 1) || (cell_rows > 1))
+        if ((cell_rows > 1) || (cell_cols > 1))
         {
             int i, j;
             for (j=row; j < row + cell_rows; j++)