diff --git a/code/CommentTableField.php b/code/CommentTableField.php
index 4eceadf8..c53e3228 100644
--- a/code/CommentTableField.php
+++ b/code/CommentTableField.php
@@ -98,6 +98,21 @@ class CommentTableField extends ComplexTableField {
 		return $this->mode == 'spam';
 	}
 
+	function SearchForm() {
+		$searchFields = new FieldGroup(
+			new TextField('MemberSearch', 'Search'),
+			new HiddenField("ctf[mode]",'',$this->mode)
+		);
+		
+		$actionFields = new LiteralField('CommentFilterButton','<input type="submit" name="CommentFilterButton" value="Filter" id="CommentFilterButton"/>');
+		
+		$fieldContainer = new FieldGroup(
+			$searchFields,
+			$actionFields
+		);
+		
+		return $fieldContainer->FieldHolder();
+	}
 }
 
 
diff --git a/templates/Includes/CommentTableField.ss b/templates/Includes/CommentTableField.ss
index 8e32ae9e..9106c2e6 100644
--- a/templates/Includes/CommentTableField.ss
+++ b/templates/Includes/CommentTableField.ss
@@ -1,4 +1,7 @@
 <div id="$id" class="$Classes">
+	<div class="CommentFilter">
+		$SearchForm
+	</div>
 	<% include TableListField_PageControls %>
 	<table class="data">
 		<thead>