diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs
index 23c716df5..8108f3c95 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs
@@ -39,7 +39,12 @@ namespace Orchard.Widgets {
                             widget.Classes.Add("widget-" + widgetPart.Name);
 
                             // Widget__Name__[Name]
-                            displaying.ShapeMetadata.Alternates.Add("Widget__Name__" + widgetPart.Name);
+                            if (widgetPart.Name.Contains("-")) {
+                                displaying.ShapeMetadata.Alternates.Add("Widget__Name__" + widgetPart.Name.Replace("-", "__"));
+                            }
+                            else {
+                                displaying.ShapeMetadata.Alternates.Add("Widget__Name__" + widgetPart.Name);
+                            }
                         }
 
                     }