diff --git a/eeschema/sch_bus_entry.cpp b/eeschema/sch_bus_entry.cpp
index 5faa48e861..02b7cba077 100644
--- a/eeschema/sch_bus_entry.cpp
+++ b/eeschema/sch_bus_entry.cpp
@@ -162,8 +162,10 @@ void SCH_BUS_ENTRY_BASE::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint&
 
     if( aColor != COLOR4D::UNSPECIFIED )
         color = aColor;
+    else if( aPanel->GetScreen() && !aPanel->GetScreen()->m_IsPrinting && GetState( BRIGHTENED ) )
+        color = GetLayerColor( LAYER_BRIGHTENED );
     else
-        color = GetLayerColor( GetState( BRIGHTENED ) ? LAYER_BRIGHTENED : m_Layer );
+        color = GetLayerColor( m_Layer );
 
     GRSetDrawMode( aDC, aDrawMode );
 
diff --git a/eeschema/sch_junction.cpp b/eeschema/sch_junction.cpp
index 3810b83039..4b153fc094 100644
--- a/eeschema/sch_junction.cpp
+++ b/eeschema/sch_junction.cpp
@@ -98,8 +98,10 @@ void SCH_JUNCTION::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffs
 
     if( aColor != COLOR4D::UNSPECIFIED )
         color = aColor;
+    else if( aPanel->GetScreen() && !aPanel->GetScreen()->m_IsPrinting && GetState( BRIGHTENED ) )
+        color = GetLayerColor( LAYER_BRIGHTENED );
     else
-        color = GetLayerColor( GetState( BRIGHTENED ) ? LAYER_BRIGHTENED : m_Layer );
+        color = GetLayerColor( m_Layer );
 
     GRSetDrawMode( aDC, aDrawMode );
 
diff --git a/eeschema/sch_line.cpp b/eeschema/sch_line.cpp
index cf72f49caa..f31bc96a4f 100644
--- a/eeschema/sch_line.cpp
+++ b/eeschema/sch_line.cpp
@@ -315,8 +315,10 @@ void SCH_LINE::Draw( EDA_DRAW_PANEL* panel, wxDC* DC, const wxPoint& offset,
         color = Color;
     else if( m_color != COLOR4D::UNSPECIFIED )
         color = m_color;
+    else if( panel->GetScreen() && !panel->GetScreen()->m_IsPrinting && GetState( BRIGHTENED ) )
+        color = GetLayerColor( LAYER_BRIGHTENED );
     else
-        color = GetLayerColor( GetState( BRIGHTENED ) ? LAYER_BRIGHTENED : m_Layer );
+        color = GetLayerColor( m_Layer );
 
     GRSetDrawMode( DC, DrawMode );
 
diff --git a/eeschema/sch_text.cpp b/eeschema/sch_text.cpp
index 416a2fd2e2..cfa1ae9746 100644
--- a/eeschema/sch_text.cpp
+++ b/eeschema/sch_text.cpp
@@ -315,8 +315,10 @@ void SCH_TEXT::Draw( EDA_DRAW_PANEL* panel, wxDC* DC, const wxPoint& aOffset,
 
     if( Color != COLOR4D::UNSPECIFIED )
         color = Color;
+    else if( panel->GetScreen() && !panel->GetScreen()->m_IsPrinting && GetState( BRIGHTENED ) )
+        color = GetLayerColor( LAYER_BRIGHTENED );
     else
-        color = GetLayerColor( GetState( BRIGHTENED ) ? LAYER_BRIGHTENED : m_Layer );
+        color = GetLayerColor( m_Layer );
 
     GRSetDrawMode( DC, DrawMode );
 
@@ -803,8 +805,10 @@ void SCH_GLOBALLABEL::Draw( EDA_DRAW_PANEL* panel,
 
     if( Color != COLOR4D::UNSPECIFIED )
         color = Color;
+    else if( panel->GetScreen() && !panel->GetScreen()->m_IsPrinting && GetState( BRIGHTENED ) )
+        color = GetLayerColor( LAYER_BRIGHTENED );
     else
-        color = GetLayerColor( GetState( BRIGHTENED ) ? LAYER_BRIGHTENED : m_Layer );
+        color = GetLayerColor( m_Layer );
 
     GRSetDrawMode( DC, DrawMode );
 
@@ -1068,8 +1072,10 @@ void SCH_HIERLABEL::Draw( EDA_DRAW_PANEL* panel,
 
     if( Color != COLOR4D::UNSPECIFIED )
         color = Color;
+    else if( panel->GetScreen() && !panel->GetScreen()->m_IsPrinting && GetState( BRIGHTENED ) )
+        color = GetLayerColor( LAYER_BRIGHTENED );
     else
-        color = GetLayerColor( GetState( BRIGHTENED ) ? LAYER_BRIGHTENED : m_Layer );
+        color = GetLayerColor( m_Layer );
 
     GRSetDrawMode( DC, DrawMode );