diff --git a/eeschema/sch_painter.cpp b/eeschema/sch_painter.cpp
index 4d3952e8cc..5949690fa5 100644
--- a/eeschema/sch_painter.cpp
+++ b/eeschema/sch_painter.cpp
@@ -2248,8 +2248,7 @@ void SCH_PAINTER::draw( const SCH_SYMBOL* aSymbol, int aLayer )
             tempPin->ClearFlags( IS_DANGLING );
     }
 
-    draw( &tempSymbol, aLayer, false, aSymbol->GetUnit(), aSymbol->GetConvert(),
-            aSymbol->GetDNP() );
+    draw( &tempSymbol, aLayer, false, aSymbol->GetUnit(), aSymbol->GetConvert(), aSymbol->GetDNP() );
 
     for( unsigned i = 0; i < tempPins.size(); ++i )
     {
@@ -2596,6 +2595,9 @@ void SCH_PAINTER::draw( const SCH_SHEET *aSheet, int aLayer )
             draw( &field, aLayer, false );
     }
 
+    if( isFieldsLayer( aLayer ) )
+        return;
+
     if( aLayer == LAYER_HIERLABEL || aLayer == LAYER_SELECTION_SHADOWS )
     {
         for( SCH_SHEET_PIN* sheetPin : aSheet->GetPins() )
diff --git a/eeschema/sch_view.h b/eeschema/sch_view.h
index d6bcdb9298..57c5e70743 100644
--- a/eeschema/sch_view.h
+++ b/eeschema/sch_view.h
@@ -50,6 +50,7 @@ static const int SCH_LAYER_ORDER[] =
     LAYER_INTERSHEET_REFS, LAYER_NETCLASS_REFS,
     LAYER_BUS_JUNCTION, LAYER_JUNCTION, LAYER_NOCONNECT,
     LAYER_HIERLABEL, LAYER_GLOBLABEL, LAYER_LOCLABEL,
+    LAYER_SHEETFILENAME, LAYER_SHEETNAME, LAYER_SHEETLABEL, LAYER_SHEETFIELDS,
     LAYER_WIRE, LAYER_BUS,
     LAYER_DEVICE,
     LAYER_NOTES,