diff --git a/javascript/GridField.js b/javascript/GridField.js
index 6d7136413..f5ce69eb0 100644
--- a/javascript/GridField.js
+++ b/javascript/GridField.js
@@ -247,4 +247,18 @@
 		}
 	});
 
+	$(".ss-gridfield .pagination-page-number input").entwine({
+		onkeydown: function(event) {
+			if(event.keyCode == 13) {
+				var newpage = parseInt($(this).val(), 10);
+
+				var gridfield = $(this).getGridField();
+				gridfield.setState('GridFieldPaginator', {currentPage: newpage});
+				gridfield.reload();
+
+				return false;
+			}
+		}
+	});
+
 }(jQuery));
diff --git a/templates/Includes/GridFieldPaginator_Row.ss b/templates/Includes/GridFieldPaginator_Row.ss
index 6d280e93c..595270521 100644
--- a/templates/Includes/GridFieldPaginator_Row.ss
+++ b/templates/Includes/GridFieldPaginator_Row.ss
@@ -1,7 +1,7 @@
 <tr>
 	<td class="bottom-all" colspan="$Colspan">
 		<div class="datagrid-pagination">
-			$FirstPage $PreviousPage <span class="pagination-page-number">Page $CurrentPageNum of $NumPages</span> $NextPage $LastPage 
+			$FirstPage $PreviousPage <span class="pagination-page-number">Page <input value="$CurrentPageNum"/> of $NumPages</span> $NextPage $LastPage 
 		</div>
 		
 		<span class="pagination-records-number">View $FirstShownRecord - $LastShownRecord of $NumRecords</span>