diff --git a/pcbnew/footprint_edit_frame.cpp b/pcbnew/footprint_edit_frame.cpp
index c943715bde..7a176088dc 100644
--- a/pcbnew/footprint_edit_frame.cpp
+++ b/pcbnew/footprint_edit_frame.cpp
@@ -221,6 +221,7 @@ FOOTPRINT_EDIT_FRAME::FOOTPRINT_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent,
     m_showGridAxis = true;               // show the grid origin axis
     m_hotkeysDescrList = g_Module_Editor_Hotkeys_Descr;
     m_FrameSize = ConvertDialogToPixels( wxSize( 500, 350 ) );    // default in case of no prefs
+    m_canvasType = aBackend;
 
     // Give an icon
     wxIcon icon;
diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp
index a142b309bd..8bcab56ac2 100644
--- a/pcbnew/pcb_edit_frame.cpp
+++ b/pcbnew/pcb_edit_frame.cpp
@@ -437,13 +437,11 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
         m_firstRunDialogSetting = 1;
         SaveSettings( config() );
     }
-    else
+
+    if( m_canvasType != EDA_DRAW_PANEL_GAL::GAL_TYPE_NONE )
     {
-        if( m_canvasType != EDA_DRAW_PANEL_GAL::GAL_TYPE_NONE )
-        {
-            if( GetGalCanvas()->SwitchBackend( m_canvasType ) )
-                UseGalCanvas( true );
-        }
+        if( GetGalCanvas()->SwitchBackend( m_canvasType ) )
+            UseGalCanvas( true );
     }
 
     enableGALSpecificMenus();