diff --git a/pcbnew/footprint_editor_utils.cpp b/pcbnew/footprint_editor_utils.cpp
index d8ad1de04a..52f016d8bf 100644
--- a/pcbnew/footprint_editor_utils.cpp
+++ b/pcbnew/footprint_editor_utils.cpp
@@ -211,8 +211,13 @@ void FOOTPRINT_EDIT_FRAME::OnEditItemRequest( BOARD_ITEM* aItem )
     }
     break;
 
+    case PCB_GROUP_T:
+        m_toolManager->RunAction( PCB_ACTIONS::groupProperties, true, aItem );
+        break;
+
     default:
-        wxASSERT( 0 );
+        wxFAIL_MSG( "FOOTPRINT_EDIT_FRAME::OnEditItemRequest: unsupported item type "
+                    + aItem->GetClass() );
         break;
     }
 }
diff --git a/pcbnew/tools/edit_tool.cpp b/pcbnew/tools/edit_tool.cpp
index 9478e437bf..fe802f4615 100644
--- a/pcbnew/tools/edit_tool.cpp
+++ b/pcbnew/tools/edit_tool.cpp
@@ -1397,8 +1397,8 @@ int EDIT_TOOL::Remove( const TOOL_EVENT& aEvent )
                 if( bItem->GetParent() && bItem->GetParent()->Type() == PCB_FOOTPRINT_T )
                 {
                     m_commit->Modify( bItem->GetParent() );
-                    getView()->Remove( group );
-                    bItem->GetParent()->Remove( group );
+                    getView()->Remove( bItem );
+                    bItem->GetParent()->Remove( bItem );
                 }
                 else
                 {