diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/FilterScreen.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/FilterScreen.java
index f9f625a76..571e9481e 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/screen/FilterScreen.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/FilterScreen.java
@@ -14,6 +14,7 @@ import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraftforge.fml.client.config.GuiCheckBox;
+import org.lwjgl.glfw.GLFW;
 
 public class FilterScreen extends BaseScreen<ContainerFilter> {
     private ItemStack stack;
@@ -86,6 +87,19 @@ public class FilterScreen extends BaseScreen<ContainerFilter> {
         toggleModFilter.x = toggleMode.x + toggleMode.getWidth() + 4;
     }
 
+    @Override
+    public boolean keyPressed(int key, int scanCode, int modifiers) {
+        if (key == GLFW.GLFW_KEY_ESCAPE) {
+            minecraft.player.closeScreen();
+        }
+
+        if (nameField.keyPressed(key, scanCode, modifiers) || nameField.func_212955_f()) {
+            return true;
+        }
+
+        return super.keyPressed(key, scanCode, modifiers);
+    }
+
     @Override
     public void tick(int x, int y) {
     }