diff --git a/pcbnew/class_drawsegment.cpp b/pcbnew/class_drawsegment.cpp
index 6f53adcd55..5f81397f06 100644
--- a/pcbnew/class_drawsegment.cpp
+++ b/pcbnew/class_drawsegment.cpp
@@ -640,17 +640,15 @@ bool DRAWSEGMENT::HitTest( const wxPoint& aPosition ) const
 
     case S_POLYGON:
         {
-            #define MAX_DIST_IN_MM 0.25
-            int distmax = std::max( m_Width, Millimeter2iu( MAX_DIST_IN_MM ) );
-
             if( !IsPolygonFilled() )
             {
                 SHAPE_POLY_SET::VERTEX_INDEX i;
                 auto poly = m_Poly;  //todo: Fix CollideEdge to be const
-                return poly.CollideEdge(VECTOR2I( aPosition ), i, distmax );
+                return poly.CollideEdge(VECTOR2I( aPosition ), i,
+                        std::max( m_Width / 2, Millimeter2iu( 0.25 ) ) );
             }
             else
-                return m_Poly.Collide( VECTOR2I( aPosition ), distmax );
+                return m_Poly.Collide( VECTOR2I( aPosition ), m_Width / 2 );
         }
         break;