diff --git a/CHANGELOG.md b/CHANGELOG.md
index 292897b18..f44c26a0e 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Refined Storage Changelog
 
+### 0.9.4
+- Fixed mod not working without JEI (raoulvdberge)
+
 ### 0.9.3
 - Updated German translation for Fluid Storage (0blu)
 - Updated Dutch translation for Fluid Storage (raoulvdberge)
diff --git a/src/main/java/refinedstorage/gui/grid/GuiGrid.java b/src/main/java/refinedstorage/gui/grid/GuiGrid.java
index 7ef3fd0e5..1a29a8f61 100755
--- a/src/main/java/refinedstorage/gui/grid/GuiGrid.java
+++ b/src/main/java/refinedstorage/gui/grid/GuiGrid.java
@@ -28,6 +28,7 @@ import refinedstorage.gui.grid.stack.ClientStackItem;
 import refinedstorage.gui.grid.stack.IClientStack;
 import refinedstorage.gui.sidebutton.*;
 import refinedstorage.integration.jei.IntegrationJEI;
+import refinedstorage.integration.jei.RefinedStorageJEIPlugin;
 import refinedstorage.network.*;
 import refinedstorage.tile.grid.IGrid;
 import refinedstorage.tile.grid.TileGrid;
@@ -416,7 +417,7 @@ public class GuiGrid extends GuiBase {
 
     private void updateJEI() {
         if (IntegrationJEI.isLoaded() && (grid.getSearchBoxMode() == TileGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED || grid.getSearchBoxMode() == TileGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED)) {
-            IntegrationJEI.INSTANCE.getRuntime().getItemListOverlay().setFilterText(searchField.getText());
+            RefinedStorageJEIPlugin.INSTANCE.getRuntime().getItemListOverlay().setFilterText(searchField.getText());
         }
     }
 
diff --git a/src/main/java/refinedstorage/integration/jei/IntegrationJEI.java b/src/main/java/refinedstorage/integration/jei/IntegrationJEI.java
index 88a7f7b35..31477a585 100755
--- a/src/main/java/refinedstorage/integration/jei/IntegrationJEI.java
+++ b/src/main/java/refinedstorage/integration/jei/IntegrationJEI.java
@@ -1,43 +1,8 @@
 package refinedstorage.integration.jei;
 
-import mezz.jei.api.IJeiRuntime;
-import mezz.jei.api.IModPlugin;
-import mezz.jei.api.IModRegistry;
-import mezz.jei.api.JEIPlugin;
-import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.common.Loader;
-import refinedstorage.RefinedStorageBlocks;
-
-@JEIPlugin
-public class IntegrationJEI implements IModPlugin {
-    public static IntegrationJEI INSTANCE;
-
-    private IJeiRuntime runtime;
-
-    @Override
-    public void register(IModRegistry registry) {
-        INSTANCE = this;
-
-        registry.getRecipeTransferRegistry().addRecipeTransferHandler(new RecipeTransferHandlerGrid());
-
-        registry.addRecipeCategories(new RecipeCategorySolderer(registry.getJeiHelpers().getGuiHelper()));
-
-        registry.addRecipeHandlers(new RecipeHandlerSolderer());
-
-        registry.addRecipes(RecipeMakerSolderer.getRecipes());
-
-        registry.addRecipeCategoryCraftingItem(new ItemStack(RefinedStorageBlocks.SOLDERER), RecipeCategorySolderer.ID);
-    }
-
-    @Override
-    public void onRuntimeAvailable(IJeiRuntime runtime) {
-        this.runtime = runtime;
-    }
-
-    public IJeiRuntime getRuntime() {
-        return runtime;
-    }
 
+public final class IntegrationJEI {
     public static boolean isLoaded() {
         return Loader.isModLoaded("JEI");
     }
diff --git a/src/main/java/refinedstorage/integration/jei/RefinedStorageJEIPlugin.java b/src/main/java/refinedstorage/integration/jei/RefinedStorageJEIPlugin.java
new file mode 100755
index 000000000..0fa58a759
--- /dev/null
+++ b/src/main/java/refinedstorage/integration/jei/RefinedStorageJEIPlugin.java
@@ -0,0 +1,39 @@
+package refinedstorage.integration.jei;
+
+import mezz.jei.api.IJeiRuntime;
+import mezz.jei.api.IModPlugin;
+import mezz.jei.api.IModRegistry;
+import mezz.jei.api.JEIPlugin;
+import net.minecraft.item.ItemStack;
+import refinedstorage.RefinedStorageBlocks;
+
+@JEIPlugin
+public class RefinedStorageJEIPlugin implements IModPlugin {
+    public static RefinedStorageJEIPlugin INSTANCE;
+
+    private IJeiRuntime runtime;
+
+    @Override
+    public void register(IModRegistry registry) {
+        INSTANCE = this;
+
+        registry.getRecipeTransferRegistry().addRecipeTransferHandler(new RecipeTransferHandlerGrid());
+
+        registry.addRecipeCategories(new RecipeCategorySolderer(registry.getJeiHelpers().getGuiHelper()));
+
+        registry.addRecipeHandlers(new RecipeHandlerSolderer());
+
+        registry.addRecipes(RecipeMakerSolderer.getRecipes());
+
+        registry.addRecipeCategoryCraftingItem(new ItemStack(RefinedStorageBlocks.SOLDERER), RecipeCategorySolderer.ID);
+    }
+
+    @Override
+    public void onRuntimeAvailable(IJeiRuntime runtime) {
+        this.runtime = runtime;
+    }
+
+    public IJeiRuntime getRuntime() {
+        return runtime;
+    }
+}