diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bb3a98b8..435bc83c1 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Added OR search operator to the Grid with "|" (raoulvdberge)
 - getPatterns() now only returns all the outputs, this to limit memory usage in OpenComputers (only affects OC integration). (fspijkerman)
 - Added new getPattern(stack:table) function for OpenComputers integration (fspijkerman)
+- Fixed repeated key events not getting handled in some cases (tomKPZ)
 
 ### 1.5.33
 - Added Crafter Manager (raoulvdberge)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java
index 0765f37db..6d165ce2b 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java
@@ -20,6 +20,8 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fml.client.config.GuiCheckBox;
 import net.minecraftforge.fml.client.config.GuiUtils;
 import net.minecraftforge.items.SlotItemHandler;
+
+import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 
 import javax.annotation.Nonnull;
@@ -101,6 +103,8 @@ public abstract class GuiBase extends GuiContainer {
 
         initializing = true;
 
+        Keyboard.enableRepeatEvents(true);
+
         calcHeight();
 
         super.initGui();
@@ -117,6 +121,12 @@ public abstract class GuiBase extends GuiContainer {
         initializing = false;
     }
 
+    @Override
+    public void onGuiClosed() {
+        super.onGuiClosed();
+        Keyboard.enableRepeatEvents(false);
+    }
+
     protected void calcHeight() {
     }