diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
index 177146de6e..12f69c269c 100644
--- a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
+++ b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
@@ -391,7 +391,7 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::copyPanelToOptions()
     }
 
     //Set the part selection in multiple part per package
-    if( m_cmp->GetUnit() )
+    if( m_cmp->GetUnitCount() > 1 )
     {
         int unit_selection = unitChoice->GetCurrentSelection() + 1;