diff --git a/eeschema/lib_text.cpp b/eeschema/lib_text.cpp
index cf037fe297..6c91102e66 100644
--- a/eeschema/lib_text.cpp
+++ b/eeschema/lib_text.cpp
@@ -55,7 +55,7 @@ LIB_TEXT::LIB_TEXT( LIB_PART * aParent ) :
 void LIB_TEXT::ViewGetLayers( int aLayers[], int& aCount ) const
 {
     aCount      = 1;
-    aLayers[0]  = LAYER_NOTES;
+    aLayers[0]  = LAYER_DEVICE;
 }
 
 
diff --git a/eeschema/sch_painter.cpp b/eeschema/sch_painter.cpp
index 2ffa025fe2..0d8d9c7dbf 100644
--- a/eeschema/sch_painter.cpp
+++ b/eeschema/sch_painter.cpp
@@ -425,7 +425,7 @@ void SCH_PAINTER::draw( LIB_TEXT *aText, int aLayer )
     if( !isUnitAndConversionShown( aText ) )
         return;
 
-    COLOR4D color = m_schSettings.GetLayerColor( LAYER_NOTES );
+    COLOR4D color = m_schSettings.GetLayerColor( LAYER_DEVICE );
 
     if( aText->IsMoving() || aText->GetParent()->IsMoving() )
         color = selectedBrightening( color );