diff --git a/docs/changes.txt b/docs/changes.txt
index 1decb28b30..134c7ab1ea 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -594,6 +594,7 @@ wxGTK:
 wxMSW:
 
 - Fix blank wxBitmapComboBox dropdown appearance.
+- Fix clicking on checkboxes in wxDataViewCtrl.
 - Make "%lu" work with size_t arguments under Win64 (laro).
 - Fix wxRegion::Offset() with shared objects (Joost Nieuwenhuijse).
 - Fix wxSocket::Initialize() after Shutdown() (Laurent Poujoulat).
diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 05f1b3992e..1c3385896c 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -4414,7 +4414,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             // adjust the rectangle ourselves to account for the alignment
             int align = cell->GetAlignment();
             if ( align == wxDVR_DEFAULT_ALIGNMENT )
-                align = wxALIGN_CENTRE;
+                align = cell->GetOwner()->GetAlignment() | wxALIGN_CENTRE_VERTICAL;
 
             wxRect rectItem = cell_rect;
             const wxSize size = cell->GetSize();