diff --git a/pcbnew/basepcbframe.cpp b/pcbnew/basepcbframe.cpp
index 12d783e143..0e4299eaef 100644
--- a/pcbnew/basepcbframe.cpp
+++ b/pcbnew/basepcbframe.cpp
@@ -157,7 +157,7 @@ PCB_BASE_FRAME::PCB_BASE_FRAME( KIWAY* aKiway, wxWindow* aParent, ID_DRAWFRAME_T
 
     SetGalCanvas( new EDA_DRAW_PANEL_GAL(
             this, -1, wxPoint( 0, 0 ), m_FrameSize,
-            EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL ) );
+            EDA_DRAW_PANEL_GAL::GAL_TYPE_CAIRO ) );
 
     // Hide by default, it has to be explicitly shown
     GetGalCanvas()->Hide();
diff --git a/pcbnew/pcbframe.cpp b/pcbnew/pcbframe.cpp
index f602df3d53..302a9574c8 100644
--- a/pcbnew/pcbframe.cpp
+++ b/pcbnew/pcbframe.cpp
@@ -490,13 +490,13 @@ void PCB_EDIT_FRAME::SetBoard( BOARD* aBoard )
 {
     PCB_BASE_FRAME::SetBoard( aBoard );
 
-    if( GetGalCanvas() )
+    if( IsGalCanvasActive() )
     {
         ViewReloadBoard( aBoard );
 
         // update the tool manager with the new board and its view.
         m_toolManager.SetEnvironment( aBoard, GetGalCanvas()->GetView(),
-                                       GetGalCanvas()->GetViewControls(), this );
+                                      GetGalCanvas()->GetViewControls(), this );
         m_toolManager.ResetTools( TOOL_BASE::MODEL_RELOAD );
     }
 }