diff --git a/src/Orchard/ContentManagement/Drivers/ContentShapeResult.cs b/src/Orchard/ContentManagement/Drivers/ContentShapeResult.cs
index ac3f81a77..be92fce65 100644
--- a/src/Orchard/ContentManagement/Drivers/ContentShapeResult.cs
+++ b/src/Orchard/ContentManagement/Drivers/ContentShapeResult.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using Orchard.ContentManagement.Handlers;
 using Orchard.DisplayManagement.Shapes;
 using Orchard.DisplayManagement.Descriptors;
+using Orchard.Utility.Extensions;
 
 namespace Orchard.ContentManagement.Drivers {
     public class ContentShapeResult : DriverResult {
@@ -109,7 +110,7 @@ namespace Orchard.ContentManagement.Drivers {
         }
 
         public ContentShapeResult OnGroup(string groupId) {
-            _groupId = groupId;
+            _groupId = groupId.ToSafeName();
             return this;
         }