diff --git a/src/main/java/li/cil/oc2/client/gui/AbstractMachineTerminalScreen.java b/src/main/java/li/cil/oc2/client/gui/AbstractMachineTerminalScreen.java
index e0a34b75..8e1c2c8a 100644
--- a/src/main/java/li/cil/oc2/client/gui/AbstractMachineTerminalScreen.java
+++ b/src/main/java/li/cil/oc2/client/gui/AbstractMachineTerminalScreen.java
@@ -79,6 +79,22 @@ public abstract class AbstractMachineTerminalScreen<T extends AbstractMachineTer
             super.charTyped(ch, modifiers);
     }
 
+    @Override
+    public boolean mouseClicked(final double x, final double y, final int button) {
+        if (!terminalWidget.mouseClicked(x,y,button)) {
+            return super.mouseClicked(x, y, button);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean mouseReleased(final double x, final double y, final int button) {
+        if (!terminalWidget.mouseReleased(x,y,button)) {
+            return super.mouseReleased(x, y, button);
+        }
+        return true;
+    }
+
     @Override
     public boolean keyPressed(final int keyCode, final int scanCode, final int modifiers) {
         if (terminalWidget.keyPressed(keyCode, scanCode, modifiers)) {
diff --git a/src/main/java/li/cil/oc2/client/gui/MachineTerminalWidget.java b/src/main/java/li/cil/oc2/client/gui/MachineTerminalWidget.java
index acba38f3..3758ab6d 100644
--- a/src/main/java/li/cil/oc2/client/gui/MachineTerminalWidget.java
+++ b/src/main/java/li/cil/oc2/client/gui/MachineTerminalWidget.java
@@ -117,6 +117,40 @@ public final class MachineTerminalWidget {
         }
     }
 
+    public boolean mouseClicked( double x, double y, int button) {
+        int mx = (int) x;
+        int my = (int) y;
+        int sx = (int)((x - MachineTerminalWidget.TERMINAL_X) / MachineTerminalWidget.TERMINAL_WIDTH * Terminal.WIDTH);
+        int sy = (int)((y - MachineTerminalWidget.TERMINAL_Y) / MachineTerminalWidget.TERMINAL_HEIGHT * Terminal.HEIGHT);
+        boolean overTerminal = isMouseOverTerminal(mx, my);
+        if (overTerminal && shouldCaptureInput()) {
+            terminal.putInput((byte) 0x1b);
+            terminal.putInput((byte) '[');
+            terminal.putInput((byte) button);
+            terminal.putInput((byte) sx);
+            terminal.putInput((byte) sy);
+            return true;
+        }
+        return false;
+    }
+
+    public boolean mouseReleased(double x, double y, int button) {
+        int mx = (int) x;
+        int my = (int) y;
+        int sx = (int)((x - MachineTerminalWidget.TERMINAL_X) / MachineTerminalWidget.TERMINAL_WIDTH * Terminal.WIDTH);
+        int sy = (int)((y - MachineTerminalWidget.TERMINAL_Y) / MachineTerminalWidget.TERMINAL_HEIGHT * Terminal.HEIGHT);
+        boolean overTerminal = isMouseOverTerminal(mx, my);
+        if (overTerminal && shouldCaptureInput()) {
+            terminal.putInput((byte) 0x1b);
+            terminal.putInput((byte) '[');
+            terminal.putInput((byte) 3);
+            terminal.putInput((byte) sx);
+            terminal.putInput((byte) sy);
+            return true;
+        }
+        return false;
+    }
+
     public boolean charTyped(final char ch, final int modifier) {
         if (modifier == 0 || modifier == GLFW.GLFW_MOD_SHIFT) {
             terminal.putInput((byte) ch);