diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp
index a72c4b1674..ea0d6d7a15 100644
--- a/src/generic/gridctrl.cpp
+++ b/src/generic/gridctrl.cpp
@@ -953,8 +953,9 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid,
 {
     wxGridCellRenderer::Draw(grid, attr, dc, rect, row, col, isSelected);
 
-    int vAlign, hAlign;
-    attr.GetAlignment(&hAlign, &vAlign);
+    int hAlign = wxALIGN_LEFT;
+    int vAlign = wxALIGN_CENTRE_VERTICAL;
+    attr.GetNonDefaultAlignment(&hAlign, &vAlign);
 
     const wxRect
         checkBoxRect = wxGetGridCheckBoxRect
diff --git a/src/generic/grideditors.cpp b/src/generic/grideditors.cpp
index 08954cc7fe..65755042c9 100644
--- a/src/generic/grideditors.cpp
+++ b/src/generic/grideditors.cpp
@@ -1218,10 +1218,10 @@ void wxGridCellBoolEditor::Create(wxWindow* parent,
 
 void wxGridCellBoolEditor::SetSize(const wxRect& r)
 {
-    int hAlign = wxALIGN_CENTRE;
-    int vAlign = wxALIGN_CENTRE;
+    int hAlign = wxALIGN_LEFT;
+    int vAlign = wxALIGN_CENTRE_VERTICAL;
     if (GetCellAttr())
-        GetCellAttr()->GetAlignment(& hAlign, & vAlign);
+        GetCellAttr()->GetNonDefaultAlignment(&hAlign, &vAlign);
 
     const wxRect
         checkBoxRect = wxGetGridCheckBoxRect