diff --git a/docs/changes.txt b/docs/changes.txt
index d46885f33f..db8e9a67f4 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -81,6 +81,8 @@ All GUI ports:
   default extension for the template
 - Speeded up wxImage::Scale using fixed point arithmetic (Wade Brainerd)
 - Added BLOB support to wxDB (John Skiff)
+- Wizard now validates as well as doing data transfer when
+  pressing Back or Next
 
 Unix:
 
diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index fa33339481..91a35840b3 100644
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -472,7 +472,7 @@ void wxWizard::OnBackOrNext(wxCommandEvent& event)
     // ask the current page first: notice that we do it before calling
     // GetNext/Prev() because the data transfered from the controls of the page
     // may change the value returned by these methods
-    if ( m_page && !m_page->TransferDataFromWindow() )
+    if ( m_page && (!m_page->Validate() || !m_page->TransferDataFromWindow()) )
     {
         // the page data is incorrect, don't do anything
         return;