diff --git a/common/eda_draw_frame.cpp b/common/eda_draw_frame.cpp
index 0371015355..7ba7b9948d 100644
--- a/common/eda_draw_frame.cpp
+++ b/common/eda_draw_frame.cpp
@@ -650,12 +650,14 @@ bool EDA_DRAW_FRAME::saveCanvasTypeSetting( EDA_DRAW_PANEL_GAL::GAL_TYPE aCanvas
     // a parent frame)
     FRAME_T allowed_frames[] =
     {
-        FRAME_SCH, FRAME_PCB, FRAME_PCB_MODULE_EDITOR
+        FRAME_SCH,
+        FRAME_PCB, FRAME_PCB_MODULE_EDITOR,
+        FRAME_GERBER
     };
 
     bool allow_save = false;
 
-    for( int ii = 0; ii < 3; ii++ )
+    for( unsigned ii = 0; ii < arrayDim( allowed_frames ); ii++ )
     {
         if( m_Ident == allowed_frames[ii] )
         {