diff --git a/code/CommentAdmin.php b/code/CommentAdmin.php
index ad7c0fa5..8027dc21 100644
--- a/code/CommentAdmin.php
+++ b/code/CommentAdmin.php
@@ -89,6 +89,7 @@ class CommentAdmin extends LeftAndMain {
 
 		$idField = new HiddenField('ID', '', $section);
 		$table = new CommentTableField($this, "Comments", "PageComment", $section, $tableFields, $popupFields, array($filter), 'Created DESC');
+		
 		$table->setParentClass(false);
 		$table->setFieldCasting(array(
 			'Created' => 'SSDatetime->Full',
@@ -96,7 +97,9 @@ class CommentAdmin extends LeftAndMain {
 		));
 		
 		$table->setPageSize(self::get_comments_per_page());
-
+		$table->addSelectOptions(array('all'=>'All', 'none'=>'None'));
+		$table->Markable = true;
+		
 		$fields = new FieldSet(
 			new LiteralField("Title", $title),
 			$idField,
diff --git a/templates/Includes/CommentTableField.ss b/templates/Includes/CommentTableField.ss
index f7685f5a..3cecd72f 100644
--- a/templates/Includes/CommentTableField.ss
+++ b/templates/Includes/CommentTableField.ss
@@ -44,7 +44,7 @@
 			<% if Items %>
 			<% control Items %>
 				<tr id="record-$Parent.id-$ID"<% if HighlightClasses %> class="$HighlightClasses"<% end_if %>>
-					<% if Markable %><td width="18" class="$SelectionTags">$MarkingCheckbox</td><% end_if %>
+					<% if Markable %><td width="18" class="$SelectOptionClasses">$MarkingCheckbox</td><% end_if %>
 					<% control Fields %>
 					<td class="$Title">$Value</td>
 					<% end_control %>