diff --git a/pcbnew/dialogs/panel_modedit_defaults.cpp b/pcbnew/dialogs/panel_modedit_defaults.cpp
index 37a58d6023..c80c5031ac 100644
--- a/pcbnew/dialogs/panel_modedit_defaults.cpp
+++ b/pcbnew/dialogs/panel_modedit_defaults.cpp
@@ -46,6 +46,7 @@ enum
     ROW_SILK = 0,
     ROW_COPPER,
     ROW_EDGES,
+    ROW_COURTYARD,
     ROW_OTHERS,
 
     ROW_COUNT
@@ -94,7 +95,7 @@ bool PANEL_MODEDIT_DEFAULTS::TransferDataToWindow()
     {
         SET_MILS_CELL( i, COL_LINE_THICKNESS, m_brdSettings.m_LineThickness[ i ] );
 
-        if( i == ROW_EDGES )
+        if( i == ROW_EDGES || i == ROW_COURTYARD )
         {
             DISABLE_CELL( i, COL_TEXT_WIDTH );
             DISABLE_CELL( i, COL_TEXT_HEIGHT );
@@ -168,7 +169,7 @@ bool PANEL_MODEDIT_DEFAULTS::TransferDataFromWindow()
     {
         m_brdSettings.m_LineThickness[ i ] = getGridValue( i, COL_LINE_THICKNESS );
 
-        if( i == ROW_EDGES )    // edges & courtyards only define line thickness
+        if( i == ROW_EDGES || i == ROW_COURTYARD )
             continue;
 
         m_brdSettings.m_TextSize[ i ] =
diff --git a/pcbnew/dialogs/panel_modedit_defaults_base.cpp b/pcbnew/dialogs/panel_modedit_defaults_base.cpp
index 7a990842f3..7a34d822bd 100644
--- a/pcbnew/dialogs/panel_modedit_defaults_base.cpp
+++ b/pcbnew/dialogs/panel_modedit_defaults_base.cpp
@@ -97,7 +97,7 @@ PANEL_MODEDIT_DEFAULTS_BASE::PANEL_MODEDIT_DEFAULTS_BASE( wxWindow* parent, wxWi
 	m_grid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	
 	// Grid
-	m_grid->CreateGrid( 4, 5 );
+	m_grid->CreateGrid( 5, 5 );
 	m_grid->EnableEditing( true );
 	m_grid->EnableGridLines( true );
 	m_grid->EnableDragGridSize( false );
@@ -124,8 +124,9 @@ PANEL_MODEDIT_DEFAULTS_BASE::PANEL_MODEDIT_DEFAULTS_BASE( wxWindow* parent, wxWi
 	m_grid->SetRowLabelSize( 125 );
 	m_grid->SetRowLabelValue( 0, _("Silk Layers") );
 	m_grid->SetRowLabelValue( 1, _("Copper Layers") );
-	m_grid->SetRowLabelValue( 2, _("Edges & Courtyards") );
-	m_grid->SetRowLabelValue( 3, _("Other Layers") );
+	m_grid->SetRowLabelValue( 2, _("Edge Cuts") );
+	m_grid->SetRowLabelValue( 3, _("Courtyards") );
+	m_grid->SetRowLabelValue( 4, _("Other Layers") );
 	m_grid->SetRowLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
 	
 	// Label Appearance
diff --git a/pcbnew/dialogs/panel_modedit_defaults_base.fbp b/pcbnew/dialogs/panel_modedit_defaults_base.fbp
index 570a0b062b..99e893a61f 100644
--- a/pcbnew/dialogs/panel_modedit_defaults_base.fbp
+++ b/pcbnew/dialogs/panel_modedit_defaults_base.fbp
@@ -1162,10 +1162,10 @@
                                         <property name="resize">Resizable</property>
                                         <property name="row_label_horiz_alignment">wxALIGN_LEFT</property>
                                         <property name="row_label_size">125</property>
-                                        <property name="row_label_values">&quot;Silk Layers&quot; &quot;Copper Layers&quot; &quot;Edges &amp; Courtyards&quot; &quot;Other Layers&quot;</property>
+                                        <property name="row_label_values">&quot;Silk Layers&quot; &quot;Copper Layers&quot; &quot;Edge Cuts&quot; &quot;Courtyards&quot; &quot;Other Layers&quot;</property>
                                         <property name="row_label_vert_alignment">wxALIGN_CENTRE</property>
                                         <property name="row_sizes"></property>
-                                        <property name="rows">4</property>
+                                        <property name="rows">5</property>
                                         <property name="show">1</property>
                                         <property name="size"></property>
                                         <property name="subclass">WX_GRID; widgets/wx_grid.h; forward_declare</property>