diff --git a/pcbnew/pcbnew_config.cpp b/pcbnew/pcbnew_config.cpp
index c5fa68b923..51c5e7fb85 100644
--- a/pcbnew/pcbnew_config.cpp
+++ b/pcbnew/pcbnew_config.cpp
@@ -141,7 +141,8 @@ bool PCB_EDIT_FRAME::LoadProjectSettings()
     opts.m_ZoneOpacity         = localSettings.m_ZoneOpacity;
     SetDisplayOptions( opts );
 
-    SetActiveLayer( localSettings.m_ActiveLayer );
+    if( GetBoard()->GetDesignSettings().IsLayerEnabled( localSettings.m_ActiveLayer ) )
+        SetActiveLayer( localSettings.m_ActiveLayer );
 
     return true;
 }