diff --git a/pcbnew/board_design_settings.cpp b/pcbnew/board_design_settings.cpp
index 7d19677bd2..d7ea165a59 100644
--- a/pcbnew/board_design_settings.cpp
+++ b/pcbnew/board_design_settings.cpp
@@ -1432,8 +1432,11 @@ void BOARD_DESIGN_SETTINGS::SetCopperLayerCount( int aNewLayerCount )
 
 void BOARD_DESIGN_SETTINGS::SetEnabledLayers( LSET aMask )
 {
-    // Back and front layers are always enabled.
-    aMask.set( B_Cu ).set( F_Cu );
+    // Ensures mandatory back and front layers are always enabled
+    // regardless of board file configuration.
+    aMask.set( B_Cu ).set( F_Cu )
+         .set( B_CrtYd ).set( F_CrtYd )
+         .set( Edge_Cuts ).set( Margin );
 
     m_enabledLayers = aMask;