diff --git a/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs b/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs
index ea714bc52..a26be082a 100644
--- a/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs
+++ b/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs
@@ -75,6 +75,10 @@ namespace Orchard.ContentManagement.Drivers {
                     if(String.IsNullOrEmpty(location) || location == "-") {
                         return editor;
                     }
+
+                    if (editor.GetGroup() != context.GroupId) {
+                        return editor;
+                    }
                 }
             }