diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 48d0487cde..5be1656e61 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -3627,10 +3627,6 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
         return;
     }
 
-    // don't use m_linesPerPage directly as it might not be computed yet
-    const int pageSize = GetCountPerPage();
-    wxCHECK_RET( pageSize, wxT("should have non zero page size") );
-
     switch ( event.GetKeyCode() )
     {
         case WXK_RETURN:
@@ -3756,11 +3752,11 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
             break;
 
         case WXK_PAGEUP:
-            OnVerticalNavigation(event, -(pageSize - 1));
+            OnVerticalNavigation(event, -(GetCountPerPage() - 1));
             break;
 
         case WXK_PAGEDOWN:
-            OnVerticalNavigation(event, +(pageSize - 1));
+            OnVerticalNavigation(event, +(GetCountPerPage() - 1));
             break;
 
         default: