diff --git a/forms/gridfield/GridFieldSortableHeader.php b/forms/gridfield/GridFieldSortableHeader.php
index 0e6f10f6d..255a91953 100644
--- a/forms/gridfield/GridFieldSortableHeader.php
+++ b/forms/gridfield/GridFieldSortableHeader.php
@@ -85,7 +85,6 @@ class GridFieldSortableHeader implements GridField_HTMLProvider, GridField_DataM
 				}
 			} else {
 				$field = new LiteralField($columnField, '<span class="non-sortable">' . $title . '</span>');
-				$field->addExtraClass("col-".preg_replace('/[^\w]/', '-', $columnField));
 			}
 			$forTemplate->Fields->push($field);
 		}
diff --git a/templates/Includes/GridFieldSortableHeader_Row.ss b/templates/Includes/GridFieldSortableHeader_Row.ss
index 4f9858323..d1493644c 100644
--- a/templates/Includes/GridFieldSortableHeader_Row.ss
+++ b/templates/Includes/GridFieldSortableHeader_Row.ss
@@ -1,5 +1,5 @@
 <tr class="sortable-header">
 	<% control Fields %>
-		<th class="main $extraClass"><span>$Field</span></th>
+		<th class="main col-$getName"><span>$Field</span></th>
 	<% end_control %>
 </tr>