diff --git a/pcbnew/footprint.cpp b/pcbnew/footprint.cpp
index a34787bda7..fed42abbfc 100644
--- a/pcbnew/footprint.cpp
+++ b/pcbnew/footprint.cpp
@@ -1820,7 +1820,7 @@ std::vector<const PAD*> FOOTPRINT::GetPads( const wxString& aPadNumber, const PA
 
     for( const PAD* pad : m_pads )
     {
-        if( aIgnore && aIgnore == pad )
+        if( ( aIgnore && aIgnore == pad ) || ( pad->GetNumber() != aPadNumber ) )
             continue;
 
         retv.push_back( pad );