diff --git a/gradle.properties b/gradle.properties
index 4b944897e..4b74c354c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,4 +5,4 @@ curse_project_id=238222
 
 version_major=3
 version_minor=6
-version_patch=5
+version_patch=6
diff --git a/src/main/java/mezz/jei/GuiEventHandler.java b/src/main/java/mezz/jei/GuiEventHandler.java
index 5a8d136f6..e8f538c44 100644
--- a/src/main/java/mezz/jei/GuiEventHandler.java
+++ b/src/main/java/mezz/jei/GuiEventHandler.java
@@ -1,5 +1,8 @@
 package mezz.jei;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import mezz.jei.config.Config;
 import mezz.jei.gui.ItemListOverlay;
 import mezz.jei.gui.RecipesGui;
@@ -14,9 +17,6 @@
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 import org.lwjgl.input.Mouse;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 public class GuiEventHandler {
 	@Nonnull
 	private static final String showRecipesText = Translator.translateToLocal("jei.tooltip.show.recipes");
@@ -40,7 +40,11 @@ public void onGuiInit(@Nonnull GuiScreenEvent.InitGuiEvent.Post event) {
 
 			RecipesGui recipesGui = new RecipesGui();
 			inputHandler = new InputHandler(recipesGui, itemListOverlay);
-		} else if (!(gui instanceof RecipesGui)) {
+		} else if (gui instanceof RecipesGui) {
+			if (inputHandler != null) {
+				inputHandler.onScreenResized();
+			}
+		} else {
 			inputHandler = null;
 		}
 	}
diff --git a/src/main/java/mezz/jei/input/InputHandler.java b/src/main/java/mezz/jei/input/InputHandler.java
index 669fb2d9e..acd4bcd1b 100644
--- a/src/main/java/mezz/jei/input/InputHandler.java
+++ b/src/main/java/mezz/jei/input/InputHandler.java
@@ -5,18 +5,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiRepair;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.GuiTextField;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.gui.inventory.GuiContainerCreative;
-import net.minecraft.client.settings.KeyBinding;
-import net.minecraft.item.ItemStack;
-
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.input.Mouse;
-
 import mezz.jei.Internal;
 import mezz.jei.RecipeRegistry;
 import mezz.jei.config.Config;
@@ -27,6 +15,15 @@
 import mezz.jei.gui.RecipesGui;
 import mezz.jei.util.Commands;
 import mezz.jei.util.MouseHelper;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiRepair;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.GuiTextField;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.gui.inventory.GuiContainerCreative;
+import net.minecraft.item.ItemStack;
+import org.lwjgl.input.Keyboard;
+import org.lwjgl.input.Mouse;
 
 public class InputHandler {
 
@@ -35,7 +32,7 @@ public class InputHandler {
 	@Nonnull
 	private final ItemListOverlay itemListOverlay;
 	@Nonnull
-	private final MouseHelper mouseHelper;
+	private MouseHelper mouseHelper;
 	@Nonnull
 	private final List<IShowsRecipeFocuses> showsRecipeFocuses = new ArrayList<>();
 
@@ -52,6 +49,10 @@ public InputHandler(@Nonnull RecipesGui recipesGui, @Nonnull ItemListOverlay ite
 		showsRecipeFocuses.add(new GuiContainerWrapper());
 	}
 
+	public void onScreenResized() {
+		this.mouseHelper = new MouseHelper();
+	}
+
 	public boolean handleMouseEvent(@Nonnull GuiScreen guiScreen, int mouseX, int mouseY) {
 		boolean cancelEvent = false;
 		if (Mouse.getEventButton() > -1) {