diff --git a/pcbnew/pcb_draw_panel_gal.cpp b/pcbnew/pcb_draw_panel_gal.cpp
index c0e37a0644..701c42f7e0 100644
--- a/pcbnew/pcb_draw_panel_gal.cpp
+++ b/pcbnew/pcb_draw_panel_gal.cpp
@@ -62,10 +62,12 @@ const int GAL_LAYER_ORDER[] =
     LAYER_CONFLICTS_SHADOW,
     LAYER_DRC_ERROR, LAYER_DRC_WARNING, LAYER_DRC_EXCLUSION, LAYER_MARKER_SHADOWS,
     LAYER_PAD_NETNAMES, LAYER_VIA_NETNAMES,
-    Dwgs_User,
-    Cmts_User,
-    Eco1_User, Eco2_User,
-    Edge_Cuts, Margin,
+    Dwgs_User, ZONE_LAYER_FOR( Dwgs_User ),
+    Cmts_User, ZONE_LAYER_FOR( Cmts_User ),
+    Eco1_User, ZONE_LAYER_FOR( Eco1_User ),
+    Eco2_User, ZONE_LAYER_FOR( Eco2_User ),
+    Edge_Cuts, ZONE_LAYER_FOR( Edge_Cuts ),
+    Margin, ZONE_LAYER_FOR( Margin ),
 
     User_1, ZONE_LAYER_FOR( User_1 ),
     User_2, ZONE_LAYER_FOR( User_2 ),