diff --git a/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs b/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs
index 902e7e455..138d40e7f 100644
--- a/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs
+++ b/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs
@@ -76,7 +76,10 @@ namespace Orchard.ContentManagement.Drivers {
                         return editor;
                     }
 
-                    if ((editor.GetGroup() ?? string.Empty) != (context.GroupId ?? string.Empty)) {
+                    var editorGroup = editor.GetGroup() ?? "";
+                    var contextGroup = context.GroupId ?? "";
+
+                    if (!String.Equals(editorGroup, contextGroup, StringComparison.OrdinalIgnoreCase)) {
                         return editor;
                     }
                 }