diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index 92e040f3ca..1fe7df7351 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -698,6 +698,14 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
 
             SceneObjectPart part = m_scene.GetSceneObjectPart(objectID);
 
+            // If we selected a sub-prim to edit, the objectID won't represent the object, but only a part.
+            // We have to check the permissions of the group, though.
+            if (part.ParentID != 0)
+            {
+                objectID = part.ParentUUID;
+                part = m_scene.GetSceneObjectPart(objectID);
+            }
+
             // TODO: add group support!
             //
             if (part.OwnerID != editorID)