diff --git a/pcbnew/pcbnew_printout.cpp b/pcbnew/pcbnew_printout.cpp
index 945a51e091..9d858296c2 100644
--- a/pcbnew/pcbnew_printout.cpp
+++ b/pcbnew/pcbnew_printout.cpp
@@ -52,6 +52,7 @@ void PCBNEW_PRINTOUT_SETTINGS::Load( APP_SETTINGS_BASE* aConfig )
     {
         m_DrillMarks = static_cast<DRILL_MARK_SHAPE_T>( cfg->m_Plot.pads_drill_mode );
         m_Pagination = static_cast<PAGINATION_T>( cfg->m_Plot.all_layers_on_one_page );
+        m_PrintEdgeCutsOnAllPages = cfg->m_Plot.edgecut_on_all_layers;
         m_Mirror     = cfg->m_Plot.mirror;
     }
 }
@@ -65,6 +66,7 @@ void PCBNEW_PRINTOUT_SETTINGS::Save( APP_SETTINGS_BASE* aConfig )
     {
         cfg->m_Plot.pads_drill_mode        = m_DrillMarks;
         cfg->m_Plot.all_layers_on_one_page = m_Pagination;
+        cfg->m_Plot.edgecut_on_all_layers  = m_PrintEdgeCutsOnAllPages;
         cfg->m_Plot.mirror                 = m_Mirror;
     }
 }
diff --git a/pcbnew/pcbnew_settings.cpp b/pcbnew/pcbnew_settings.cpp
index 00d70df057..d093fd5c9e 100644
--- a/pcbnew/pcbnew_settings.cpp
+++ b/pcbnew/pcbnew_settings.cpp
@@ -412,6 +412,9 @@ PCBNEW_SETTINGS::PCBNEW_SETTINGS()
     m_params.emplace_back( new PARAM<int>( "plot.all_layers_on_one_page",
             &m_Plot.all_layers_on_one_page, 1 ) );
 
+    m_params.emplace_back( new PARAM<bool>( "plot.edgecut_on_all_layers",
+            &m_Plot.edgecut_on_all_layers, true ) );
+
     m_params.emplace_back( new PARAM<int>( "plot.pads_drill_mode",
             &m_Plot.pads_drill_mode, 2 ) );
 
diff --git a/pcbnew/pcbnew_settings.h b/pcbnew/pcbnew_settings.h
index d56e586f62..159f619d61 100644
--- a/pcbnew/pcbnew_settings.h
+++ b/pcbnew/pcbnew_settings.h
@@ -182,6 +182,7 @@ public:
     struct DIALOG_PLOT
     {
         int    all_layers_on_one_page;
+        bool   edgecut_on_all_layers;
         int    pads_drill_mode;
         double fine_scale_x;
         double fine_scale_y;