diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx
index d6d04d697..5cbac23f7 100644
--- a/client/homebrew/brewRenderer/brewRenderer.jsx
+++ b/client/homebrew/brewRenderer/brewRenderer.jsx
@@ -108,6 +108,8 @@ const BrewRenderer = (props)=>{
 		const totalScrollableHeight = scrollHeight - clientHeight;
 		const currentPageNumber = Math.ceil((scrollTop / totalScrollableHeight) * rawPages.length);
 
+		handleScroll(e);
+
 		setState((prevState)=>({
 			...prevState,
 			currentPageNumber : currentPageNumber || 1
diff --git a/client/homebrew/editor/editor.jsx b/client/homebrew/editor/editor.jsx
index fe05c1b93..ffeed00b0 100644
--- a/client/homebrew/editor/editor.jsx
+++ b/client/homebrew/editor/editor.jsx
@@ -119,9 +119,6 @@ const Editor = createClass({
 		const HOME_KEY = 36;
 		const LEFTARROW_KEY = 37;
 		const RIGHTARROW_KEY = 39;
-		if(!(e.ctrlKey && e.metaKey)) return;
-
-		if(!e.ctrlKey) return;
 
 		if(this.props.liveScroll) {
 			const movementKeys = [13, 33, 34, LEFTARROW_KEY, 38, RIGHTARROW_KEY, 40];
@@ -134,6 +131,10 @@ const Editor = createClass({
 			}
 		}
 
+		if(!(e.ctrlKey && e.metaKey)) return;
+
+		if(!e.ctrlKey) return;
+
 		// Handle CTRL-HOME and CTRL-END
 		if(((e.keyCode == END_KEY) || (e.keyCode == HOME_KEY)) && this.props.liveScroll) this.brewJump();
 		if(!e.metaKey) return;