diff --git a/common/drawpanel.cpp b/common/drawpanel.cpp
index 8c96634191..35885cf643 100644
--- a/common/drawpanel.cpp
+++ b/common/drawpanel.cpp
@@ -85,10 +85,17 @@ END_EVENT_TABLE()
 
 EDA_DRAW_PANEL::EDA_DRAW_PANEL( EDA_DRAW_FRAME* parent, int id,
                                 const wxPoint& pos, const wxSize& size ) :
+#if wxCHECK_VERSION( 2, 9, 5 )
+    wxScrolledWindow( parent, id, pos, size, wxBORDER | wxHSCROLL | wxVSCROLL )
+#else
     wxScrolledWindow( parent, id, pos, size, wxBORDER | wxHSCROLL | wxVSCROLL | wxALWAYS_SHOW_SB )
+#endif
 {
     wxASSERT( parent );
 
+#if wxCHECK_VERSION( 2, 9, 5 )
+    ShowScrollbars( wxSHOW_SB_ALWAYS, wxSHOW_SB_ALWAYS );
+#endif
     m_scrollIncrementX = std::min( size.x / 8, 10 );
     m_scrollIncrementY = std::min( size.y / 8, 10 );