diff --git a/eeschema/lib_shape.cpp b/eeschema/lib_shape.cpp
index 8769f65f7f..94f10432ea 100644
--- a/eeschema/lib_shape.cpp
+++ b/eeschema/lib_shape.cpp
@@ -314,10 +314,12 @@ void LIB_SHAPE::print( const RENDER_SETTINGS* aSettings, const VECTOR2I& aOffset
             break;
 
         case SHAPE_T::POLY:
+
+            GRPoly( nullptr, DC, ptCount, buffer, true, 0, fillColor, fillColor );
+
             if( penWidth > 0 )
-                GRPoly( nullptr, DC, ptCount, buffer, true, penWidth, color, fillColor );
-            else
-                GRPoly( nullptr, DC, ptCount, buffer, true, 0, fillColor, fillColor );
+                GRPoly( nullptr, DC, ptCount, buffer, false, penWidth, color, fillColor );
+
             break;
 
         case SHAPE_T::BEZIER: