diff --git a/eeschema/dialogs/dialog_symbol_fields_table.cpp b/eeschema/dialogs/dialog_symbol_fields_table.cpp
index e1418f8542..3b07bd016e 100644
--- a/eeschema/dialogs/dialog_symbol_fields_table.cpp
+++ b/eeschema/dialogs/dialog_symbol_fields_table.cpp
@@ -490,7 +490,7 @@ public:
             SCH_REFERENCE ref = m_symbolsList[ i ];
 
             if( !aFilter->GetValue().IsEmpty()
-                    && !WildCompareString( aFilter->GetValue(), ref.GetRef(), false ) )
+                    && !WildCompareString( aFilter->GetValue(), ref.GetFullRef(), false ) )
             {
                 continue;
             }
diff --git a/eeschema/sch_reference_list.h b/eeschema/sch_reference_list.h
index 873fa737a8..c6cfacdbb6 100644
--- a/eeschema/sch_reference_list.h
+++ b/eeschema/sch_reference_list.h
@@ -107,9 +107,9 @@ public:
     wxString GetFullRef() const
     {
         if( GetSymbol()->GetUnitCount() > 1 )
-            return GetRef() + LIB_SYMBOL::SubReference( GetUnit() );
+            return GetRef() + GetRefNumber() + LIB_SYMBOL::SubReference( GetUnit() );
         else
-            return GetRef();
+            return GetRef() + GetRefNumber();
     }
 
     wxString GetRefNumber() const