diff --git a/eeschema/sch_symbol.cpp b/eeschema/sch_symbol.cpp
index 0d2c3277d2..4627074c55 100644
--- a/eeschema/sch_symbol.cpp
+++ b/eeschema/sch_symbol.cpp
@@ -1783,8 +1783,8 @@ SCH_SYMBOL& SCH_SYMBOL::operator=( const SCH_ITEM& aItem )
 
 bool SCH_SYMBOL::HitTest( const wxPoint& aPosition, int aAccuracy ) const
 {
-    EDA_RECT bBox = GetBoundingBox();
-    bBox.Inflate( aAccuracy );
+    EDA_RECT bBox = GetBodyBoundingBox();
+    bBox.Inflate( aAccuracy / 2 );
 
     if( bBox.Contains( aPosition ) )
         return true;
@@ -1800,7 +1800,7 @@ bool SCH_SYMBOL::HitTest( const EDA_RECT& aRect, bool aContained, int aAccuracy
 
     EDA_RECT rect = aRect;
 
-    rect.Inflate( aAccuracy );
+    rect.Inflate( aAccuracy / 2 );
 
     if( aContained )
         return rect.Contains( GetBodyBoundingBox() );
diff --git a/eeschema/tools/ee_selection_tool.cpp b/eeschema/tools/ee_selection_tool.cpp
index 1ec5ef756d..cc1f5c2736 100644
--- a/eeschema/tools/ee_selection_tool.cpp
+++ b/eeschema/tools/ee_selection_tool.cpp
@@ -785,7 +785,7 @@ bool EE_SELECTION_TOOL::CollectHits( EE_COLLECTOR& aCollector, const VECTOR2I& a
                                      const KICAD_T* aFilterList )
 {
     int pixelThreshold = KiROUND( getView()->ToWorld( HITTEST_THRESHOLD_PIXELS ) );
-    int gridThreshold = KiROUND( getView()->GetGAL()->GetGridSize().EuclideanNorm() );
+    int gridThreshold = KiROUND( getView()->GetGAL()->GetGridSize().EuclideanNorm() / 2 );
     aCollector.m_Threshold = std::max( pixelThreshold, gridThreshold );
 
     if( m_isSymbolEditor )