diff --git a/pcbnew/footprint_wizard_frame.cpp b/pcbnew/footprint_wizard_frame.cpp
index 599366540d..30b8ed9680 100644
--- a/pcbnew/footprint_wizard_frame.cpp
+++ b/pcbnew/footprint_wizard_frame.cpp
@@ -609,8 +609,10 @@ void FOOTPRINT_WIZARD_FRAME::ReCreateHToolbar()
                             KiBitmap( lib_next_xpm ),
                             _( "Select next parameters page" ) );
 
+#if 0   // Currently: the 3D viewer is not useful
     m_mainToolBar->AddScaledSeparator( this );
     m_mainToolBar->Add( ACTIONS::show3DViewer );
+#endif
 
     m_mainToolBar->AddScaledSeparator( this );
     m_mainToolBar->Add( ACTIONS::zoomRedraw );
diff --git a/pcbnew/footprint_wizard_frame_functions.cpp b/pcbnew/footprint_wizard_frame_functions.cpp
index a56cd7ed93..2a5aeeafa1 100644
--- a/pcbnew/footprint_wizard_frame_functions.cpp
+++ b/pcbnew/footprint_wizard_frame_functions.cpp
@@ -47,7 +47,12 @@ void FOOTPRINT_WIZARD_FRAME::Process_Special_Functions( wxCommandEvent& event )
     switch( event.GetId() )
     {
     case ID_FOOTPRINT_WIZARD_NEXT:
-        m_pageList->SetSelection( m_pageList->GetSelection() + 1, true );
+        page = m_pageList->GetSelection() + 1;
+
+        if( (int)m_pageList->GetCount() <= page )
+            page = m_pageList->GetCount() - 1;
+
+        m_pageList->SetSelection( page, true );
         ClickOnPageList( event );
         break;