diff --git a/src/main/java/mezz/jei/GuiEventHandler.java b/src/main/java/mezz/jei/GuiEventHandler.java
index 119c0b6d4..16e195901 100644
--- a/src/main/java/mezz/jei/GuiEventHandler.java
+++ b/src/main/java/mezz/jei/GuiEventHandler.java
@@ -2,7 +2,6 @@
 
 import javax.annotation.Nullable;
 
-import mezz.jei.api.ingredients.IIngredientRegistry;
 import mezz.jei.config.Config;
 import mezz.jei.gui.ItemListOverlay;
 import mezz.jei.gui.ItemListOverlayInternal;
diff --git a/src/main/java/mezz/jei/input/InputHandler.java b/src/main/java/mezz/jei/input/InputHandler.java
index 1aa82e779..07560b94b 100644
--- a/src/main/java/mezz/jei/input/InputHandler.java
+++ b/src/main/java/mezz/jei/input/InputHandler.java
@@ -47,7 +47,9 @@ public InputHandler(JeiRuntime runtime, @Nullable ItemListOverlayInternal itemLi
 		this.mouseHelper = new MouseHelper();
 
 		showsRecipeFocuses.add(recipesGui);
-		showsRecipeFocuses.add(itemListOverlayInternal);
+		if (itemListOverlayInternal != null) {
+			showsRecipeFocuses.add(itemListOverlayInternal);
+		}
 		showsRecipeFocuses.add(new GuiContainerWrapper());
 	}