diff --git a/pcbnew/class_track.cpp b/pcbnew/class_track.cpp
index b7d6456337..31f721a2f1 100644
--- a/pcbnew/class_track.cpp
+++ b/pcbnew/class_track.cpp
@@ -1319,9 +1319,13 @@ bool VIA::HitTest( const EDA_RECT& aRect, bool aContained, int aAccuracy ) const
     box.Inflate( GetWidth() / 2 );
 
     if( aContained )
+    {
         return arect.Contains( box );
+    }
     else
-        return arect.Intersects( box );
+    {
+        return arect.IntersectsCircle( GetStart(), GetWidth() / 2 );
+    }
 }