diff --git a/forms/gridfield/GridFieldFilter.php b/forms/gridfield/GridFieldFilter.php
index 0b08a8d2c..4a8165de5 100644
--- a/forms/gridfield/GridFieldFilter.php
+++ b/forms/gridfield/GridFieldFilter.php
@@ -72,19 +72,17 @@ class GridFieldFilter implements GridField_HTMLProvider, GridField_DataManipulat
 				}
 				$field = new TextField('filter['.$columnField.']', '', $value);
 				$field->addExtraClass('ss-gridfield-sort');
-			} else {
-				$field = new LiteralField('', '');
-			}
-			
-			if($columnField != 'Actions') {
+
 				$field = new FieldGroup(
 					$field,
 					$filterbutton = new GridField_Action($gridField, 'filter', _t('GridField.Filter', "Filter"), 'filter', null),
 					$resetbutton = new GridField_Action($gridField, 'reset', _t('GridField.ResetFilter', "Reset"), 'reset', null)
-					);
+				);
 
 				$filterbutton->addExtraClass('ss-gridfield-button-filter');
 				$resetbutton->addExtraClass('ss-gridfield-button-reset');	
+			} else {
+				$field = new LiteralField('', '');
 			}
 
 			$field->iteratorProperties($currentColumn-1, count($columns));
diff --git a/forms/gridfield/GridFieldSortableHeader.php b/forms/gridfield/GridFieldSortableHeader.php
index e1dd7d6a0..5853073bd 100644
--- a/forms/gridfield/GridFieldSortableHeader.php
+++ b/forms/gridfield/GridFieldSortableHeader.php
@@ -40,7 +40,7 @@ class GridFieldSortableHeader implements GridField_HTMLProvider, GridField_DataM
 						$field->addExtraClass('ss-gridfield-sorted-desc');
 				}
 			} else {
-				$field = new LiteralField($columnField, $title);
+				$field = new LiteralField($columnField, '<span class="non-sortable">' . $title . '</span>');
 			}
 			$forTemplate->Fields->push($field);
 		}