diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 8d6c29aeae..2e8b67cb67 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -4378,14 +4378,20 @@ void wxGrid::CancelMouseCapture()
 
 void wxGrid::DoAfterDraggingEnd()
 {
+    if ( m_isDragging &&
+         (m_cursorMode == WXGRID_CURSOR_SELECT_CELL ||
+          m_cursorMode == WXGRID_CURSOR_SELECT_ROW ||
+          m_cursorMode == WXGRID_CURSOR_SELECT_COL) )
+    {
+        m_selection->EndSelecting();
+    }
+
     m_isDragging = false;
     m_startDragPos = wxDefaultPosition;
 
     m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
     m_winCapture->SetCursor( *wxSTANDARD_CURSOR );
     m_winCapture = NULL;
-
-    m_selection->EndSelecting();
 }
 
 void wxGrid::EndDraggingIfNecessary()