diff --git a/eeschema/tools/sch_drawing_tools.cpp b/eeschema/tools/sch_drawing_tools.cpp
index 8700be2bc8..419ec21671 100644
--- a/eeschema/tools/sch_drawing_tools.cpp
+++ b/eeschema/tools/sch_drawing_tools.cpp
@@ -308,13 +308,8 @@ int SCH_DRAWING_TOOLS::PlaceSymbol( const TOOL_EVENT& aEvent )
                 SYMBOL_LIB_TABLE* libs = PROJECT_SCH::SchSymbolLibTable( &m_frame->Prj() );
                 SYMBOL_LIB*       cache = PROJECT_SCH::SchLibs( &m_frame->Prj() )->GetCacheLibrary();
 
-                auto compareByLibID =
-                        []( const LIB_SYMBOL* aFirst, const LIB_SYMBOL* aSecond ) -> bool
-                        {
-                            return aFirst->LibId().Format() < aSecond->LibId().Format();
-                        };
-
-                std::set<LIB_SYMBOL*, decltype( compareByLibID )> part_list( compareByLibID );
+                std::set<UTF8>             unique_libid;
+                std::vector<PICKED_SYMBOL> alreadyPlaced;
 
                 for( SCH_SHEET_PATH& sheet : sheets )
                 {
@@ -324,22 +319,21 @@ int SCH_DRAWING_TOOLS::PlaceSymbol( const TOOL_EVENT& aEvent )
                             continue;
 
                         SCH_SYMBOL* s = static_cast<SCH_SYMBOL*>( item );
+
+                        if( !unique_libid.insert( s->GetLibId().Format() ).second )
+                            continue;
+
                         LIB_SYMBOL* libSymbol = SchGetLibSymbol( s->GetLibId(), libs, cache );
 
                         if( libSymbol )
-                            part_list.insert( libSymbol );
+                        {
+                            PICKED_SYMBOL pickedSymbol;
+                            pickedSymbol.LibId = libSymbol->GetLibId();
+                            alreadyPlaced.push_back( pickedSymbol );
+                        }
                     }
                 }
 
-                std::vector<PICKED_SYMBOL> alreadyPlaced;
-
-                for( LIB_SYMBOL* libSymbol : part_list )
-                {
-                    PICKED_SYMBOL pickedSymbol;
-                    pickedSymbol.LibId = libSymbol->GetLibId();
-                    alreadyPlaced.push_back( pickedSymbol );
-                }
-
                 // Pick the symbol to be placed
                 bool footprintPreviews = m_frame->eeconfig()->m_Appearance.footprint_preview;
                 PICKED_SYMBOL sel = m_frame->PickSymbolFromLibrary( &filter, *historyList,