diff --git a/eeschema/lib_textbox.cpp b/eeschema/lib_textbox.cpp
index 13b9274aac..6c448abed0 100644
--- a/eeschema/lib_textbox.cpp
+++ b/eeschema/lib_textbox.cpp
@@ -194,6 +194,7 @@ void LIB_TEXTBOX::print( const RENDER_SETTINGS* aSettings, const VECTOR2I& aOffs
         return;
 
     bool forceNoFill = static_cast<bool>( aData );
+    bool blackAndWhiteMode = GetGRForceBlackPenState();
     int  penWidth = GetEffectivePenWidth( aSettings );
 
     wxDC*    DC = aSettings->GetPrintDC();
@@ -201,7 +202,7 @@ void LIB_TEXTBOX::print( const RENDER_SETTINGS* aSettings, const VECTOR2I& aOffs
     VECTOR2I pt2 = aTransform.TransformCoordinate( m_end ) + aOffset;
     COLOR4D  color = aSettings->GetLayerColor( LAYER_DEVICE );
 
-    if( !forceNoFill && GetFillMode() == FILL_T::FILLED_WITH_COLOR )
+    if( !forceNoFill && GetFillMode() == FILL_T::FILLED_WITH_COLOR && !blackAndWhiteMode )
         GRFilledRect( DC, pt1, pt2, penWidth, color, GetFillColor() );
 
     if( GetStroke().GetColor() != COLOR4D::UNSPECIFIED )
diff --git a/eeschema/sch_textbox.cpp b/eeschema/sch_textbox.cpp
index db025dab64..c8ea9f4663 100644
--- a/eeschema/sch_textbox.cpp
+++ b/eeschema/sch_textbox.cpp
@@ -193,11 +193,12 @@ void SCH_TEXTBOX::Print( const RENDER_SETTINGS* aSettings, const VECTOR2I& aOffs
 {
     wxDC*    DC = aSettings->GetPrintDC();
     int      penWidth = GetPenWidth();
+    bool     blackAndWhiteMode = GetGRForceBlackPenState();
     VECTOR2I pt1 = GetStart();
     VECTOR2I pt2 = GetEnd();
     COLOR4D  color;
 
-    if( GetFillMode() == FILL_T::FILLED_WITH_COLOR )
+    if( GetFillMode() == FILL_T::FILLED_WITH_COLOR && !blackAndWhiteMode )
         GRFilledRect( DC, pt1, pt2, 0, GetFillColor(), GetFillColor() );
 
     if( penWidth > 0 )