diff --git a/code/forms/GridFieldSortableRows.php b/code/forms/GridFieldSortableRows.php
index 07872a5..dcc108f 100644
--- a/code/forms/GridFieldSortableRows.php
+++ b/code/forms/GridFieldSortableRows.php
@@ -77,7 +77,7 @@ class GridFieldSortableRows implements GridField_HTMLProvider, GridField_ActionP
 		Requirements::javascript('SortableGridField/javascript/GridFieldSortableRows.js');
 		
 		
-		$args = array('Colspan' => count($gridField->getColumns()));
+		$args = array('Colspan' => count($gridField->getColumns()), 'ID' => $gridField->ID());
 		
 		return array('header' => $forTemplate->renderWith('GridFieldSortableRows', $args));
 	}
diff --git a/css/GridFieldSortableRows.css b/css/GridFieldSortableRows.css
index 96bbdaa..27ac4c8 100644
--- a/css/GridFieldSortableRows.css
+++ b/css/GridFieldSortableRows.css
@@ -2,6 +2,14 @@
 	border-bottom: 1px solid rgba(0, 0, 0, 0.1);
 }
 
+.cms table.ss-gridfield-table thead tr th.sortablerowsheading .gridfield-sortablerows input[type=checkbox] {
+	height: auto;
+}
+
+.cms table.ss-gridfield-table thead tr th.sortablerowsheading .gridfield-sortablerows {
+	line-height: 28px;
+}
+
 .cms table.ss-gridfield-table thead tr th.sortablerowsheading .gridfield-sortablerows button {
 	display: none;
 }
diff --git a/templates/Includes/GridFieldSortableRows.ss b/templates/Includes/GridFieldSortableRows.ss
index 68cd8b9..06f3d44 100644
--- a/templates/Includes/GridFieldSortableRows.ss
+++ b/templates/Includes/GridFieldSortableRows.ss
@@ -1,7 +1,7 @@
 <tr>
 	<th class="extra sortablerowsheading" colspan="$Colspan">
 		<div class="gridfield-sortablerows">
-			 <input type="checkbox" value="1"$Checked/> <%t GridFieldSortableRows.ALLOW_DRAG_DROP "_Allow drag and drop re-ordering" %>
+			 <input type="checkbox" id="{$ID}_AllowDragDropCheck" value="1"$Checked/> <label for="{$ID}_AllowDragDropCheck"><%t GridFieldSortableRows.ALLOW_DRAG_DROP "_Allow drag and drop re-ordering" %></label>
 			 $SortableToggle
 			 $PagenatorToggle
              $SortToPage