diff --git a/pcbnew/connectivity/connectivity_items.h b/pcbnew/connectivity/connectivity_items.h
index 8fabdaaa91..0c24071983 100644
--- a/pcbnew/connectivity/connectivity_items.h
+++ b/pcbnew/connectivity/connectivity_items.h
@@ -355,7 +355,8 @@ public:
     bool ContainsPoint( const VECTOR2I p ) const
     {
         auto zone = static_cast<ZONE_CONTAINER*> ( Parent() );
-        return m_cachedPoly->ContainsPoint( p, zone->GetMinThickness() );
+        int clearance = zone->GetFilledPolysUseThickness() ? zone->GetMinThickness() : 0;
+        return m_cachedPoly->ContainsPoint( p, clearance );
     }
 
     const BOX2I& BBox()