diff --git a/lms/static/js/jquery.gradebook.js b/lms/static/js/jquery.gradebook.js
index c2c3553006..7a5ce66081 100644
--- a/lms/static/js/jquery.gradebook.js
+++ b/lms/static/js/jquery.gradebook.js
@@ -80,11 +80,16 @@ var Gradebook = function($element) {
 	var filter = function(e) {
 		var term = $(this).val();
 		if(term.length > 0) {
-			$studentTable.find('tr').hide();
-			$studentTable.find('tbody tr').not(':contains(' + term + '), :nth-child(1)').hide();	
+			$studentTable.find('tbody tr').hide();
+			$gradeTable.find('tbody tr').hide();
+			$studentTable.find('tbody tr:contains(' + term + ')').each(function(i) {
+				$(this).show();
+				$gradeTable.find('tr').eq($(this).index() + 1).show();
+			});
 		} else {
 			$studentTable.find('tbody tr').show();
-		}		
+			$gradeTable.find('tbody tr').show();
+		}
 	}
 
 	$leftShadow.css('height', tableHeight + 'px');
diff --git a/lms/templates/courseware/gradebook.html b/lms/templates/courseware/gradebook.html
index 12cc491982..c4d3d125d4 100644
--- a/lms/templates/courseware/gradebook.html
+++ b/lms/templates/courseware/gradebook.html
@@ -56,77 +56,77 @@
 
         <tr>
           <td>
-            <a href="#">Name</a>
+            <a href="#">Charles Darwin</a>
           </td>
         </tr>
         <tr>
           <td>
-            <a href="#">Name</a>
+            <a href="#">George Washington</a>
           </td>
         </tr>
         <tr>
           <td>
-            <a href="#">Name</a>
+            <a href="#">George Clooney</a>
           </td>
         </tr>
         <tr>
           <td>
-            <a href="#">Name</a>
+            <a href="#">Aldous Huxley</a>
           </td>
         </tr>
         <tr>
           <td>
-            <a href="#">Name</a>
+            <a href="#">George Orwell</a>
           </td>
         </tr>
         <tr>
           <td>
-            <a href="#">Name</a>
+            <a href="#">Ayn Rand</a>
           </td>
         </tr>
         <tr>
           <td>
-            <a href="#">Name</a>
+            <a href="#">Friedrich Nietzsche</a>
           </td>
         </tr>
         <tr>
           <td>
-            <a href="#">Name</a>
+            <a href="#">Steve Jobs</a>
           </td>
         </tr>
         <tr>
           <td>
-            <a href="#">Name</a>
+            <a href="#">Bill Gates</a>
           </td>
         </tr>
         <tr>
           <td>
-            <a href="#">Name</a>
+            <a href="#">Jimmy Johns</a>
           </td>
         </tr>
         <tr>
           <td>
-            <a href="#">Name</a>
+            <a href="#">Susan B. Anthony</a>
           </td>
         </tr>
         <tr>
           <td>
-            <a href="#">Name</a>
+            <a href="#">Random McRandomson</a>
           </td>
         </tr>
         <tr>
           <td>
-            <a href="#">Name</a>
+            <a href="#">Fakey Fakerson</a>
           </td>
         </tr>
         <tr>
           <td>
-            <a href="#">Name</a>
+            <a href="#">Bob</a>
           </td>
         </tr>
         <tr>
           <td>
-            <a href="#">Name</a>
+            <a href="#">Jim</a>
           </td>
         </tr>
       </tbody>