diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx
index b69473572..66b2e3fe2 100644
--- a/client/homebrew/brewRenderer/brewRenderer.jsx
+++ b/client/homebrew/brewRenderer/brewRenderer.jsx
@@ -82,7 +82,7 @@ const BrewRenderer = (props)=>{
 	}, []);
 
 	const scrollToPage = (pageNumber) => {
-		pageNumber = pageNumber - 1;
+		pageNumber = _.clamp(pageNumber - 1, 0, rawPages.length - 1);
 		const iframe = document.getElementById('BrewRenderer');
 		if(iframe && iframe.contentWindow) {
 			const brewRenderer = iframe.contentWindow.document.querySelector('.brewRenderer');
diff --git a/client/homebrew/brewRenderer/toolBar/toolBar.jsx b/client/homebrew/brewRenderer/toolBar/toolBar.jsx
index f7ae63fcc..d3184d025 100644
--- a/client/homebrew/brewRenderer/toolBar/toolBar.jsx
+++ b/client/homebrew/brewRenderer/toolBar/toolBar.jsx
@@ -26,8 +26,8 @@ const ToolBar = ({ onZoomChange, currentPage, onPageChange, totalPages })=>{
 	};
 
 	const handlePageChange = (page)=>{
-		setPageInput((page));
-	}
+		setPageInput(page);
+	};
 
 	return (
 		<div className='toolBar'>
@@ -88,6 +88,7 @@ const ToolBar = ({ onZoomChange, currentPage, onPageChange, totalPages })=>{
 					onChange={(e)=>{
 						handlePageChange(e.target.value == false ? e.target.value : parseInt(e.target.value));}}
 					onBlur={()=>onPageChange(pageInput)}
+					onKeyDown={(e)=>{e.key == 'Enter' ? onPageChange(pageInput) : null;}}
 				/>
 
 				<span id='page-count'>/ {totalPages}</span>