diff --git a/pcbnew/plugins/kicad/pcb_parser.cpp b/pcbnew/plugins/kicad/pcb_parser.cpp
index 5c50f17e0e..e35132fa21 100644
--- a/pcbnew/plugins/kicad/pcb_parser.cpp
+++ b/pcbnew/plugins/kicad/pcb_parser.cpp
@@ -1002,6 +1002,7 @@ void PCB_PARSER::resolveGroups( BOARD_ITEM* aParent )
                 case PCB_FP_TEXT_T:
                 case PCB_FP_SHAPE_T:
                 case PCB_FP_ZONE_T:
+                case PCB_PAD_T:
                     if( item->GetParent() == group->GetParent() )
                         group->AddItem( item );
 
diff --git a/pcbnew/tools/group_tool.cpp b/pcbnew/tools/group_tool.cpp
index 140e55db73..12735b42ba 100644
--- a/pcbnew/tools/group_tool.cpp
+++ b/pcbnew/tools/group_tool.cpp
@@ -238,6 +238,7 @@ int GROUP_TOOL::Group( const TOOL_EVENT& aEvent )
                         case PCB_FP_TEXT_T:
                         case PCB_FP_SHAPE_T:
                         case PCB_FP_ZONE_T:
+                        case PCB_PAD_T:
                             aCollector.Remove( item );
                             break;