diff --git a/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java b/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java
index edeb0eb22..2069dd326 100644
--- a/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java
+++ b/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java
@@ -295,12 +295,15 @@ public class MEMonitorableScreen<T extends MEMonitorableContainer> extends AEBas
     @Override
     public boolean mouseClicked(final double xCoord, final double yCoord, final int btn) {
         if (this.searchField.mouseClicked(xCoord, yCoord, btn)) {
-            if (btn == 1 && this.searchField.isMouseOver(xCoord, yCoord)) {
-                this.searchField.setText("");
-                this.repo.setSearchString("");
-                this.repo.updateView();
-                this.setScrollBar();
-            }
+            return true;
+        }
+
+        // Right-clicking on the search field should clear it
+        if (this.searchField.isMouseOver(xCoord, yCoord) && btn == 1) {
+            this.searchField.setText("");
+            this.repo.setSearchString("");
+            this.repo.updateView();
+            this.setScrollBar();
             return true;
         }
 
diff --git a/src/main/java/appeng/client/gui/widgets/AETextField.java b/src/main/java/appeng/client/gui/widgets/AETextField.java
index 8265d3e4e..89e146d28 100644
--- a/src/main/java/appeng/client/gui/widgets/AETextField.java
+++ b/src/main/java/appeng/client/gui/widgets/AETextField.java
@@ -58,22 +58,6 @@ public class AETextField extends TextFieldWidget {
         this._fontPad = (int) fontRenderer.getCharWidth('_');
     }
 
-    @Override
-    public boolean mouseClicked(final double xPos, final double yPos, final int button) {
-        // super will always return false, if button is != 0, however super should still
-        // be called.
-        if (!super.mouseClicked(xPos, yPos, button) && button == 0) {
-            return false;
-        }
-
-        final boolean requiresFocus = this.isMouseOver(xPos, yPos);
-        if (!this.isFocused()) {
-            this.setFocused2(requiresFocus);
-        }
-
-        return true;
-    }
-
     public void selectAll() {
         this.setCursorPosition(0);
         this.setSelectionPos(this.getMaxStringLength());
diff --git a/src/main/java/appeng/debug/ChunkLoaderTileEntity.java b/src/main/java/appeng/debug/ChunkLoaderTileEntity.java
index 7c85bd99c..9cc3a93bd 100644
--- a/src/main/java/appeng/debug/ChunkLoaderTileEntity.java
+++ b/src/main/java/appeng/debug/ChunkLoaderTileEntity.java
@@ -46,6 +46,8 @@ public class ChunkLoaderTileEntity extends AEBaseTileEntity implements ITickable
 
     @Override
     public void remove() {
+        super.remove();
+
         World world = getWorld();
         if (world instanceof ServerWorld) {
             ChunkPos chunkPos = new ChunkPos(getPos());
diff --git a/src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java b/src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java
index 2535eb054..5e363b97c 100644
--- a/src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java
+++ b/src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java
@@ -266,12 +266,15 @@ public class FluidTerminalScreen extends AEBaseMEScreen<FluidTerminalContainer>
     @Override
     public boolean mouseClicked(final double xCoord, final double yCoord, final int btn) {
         if (this.searchField.mouseClicked(xCoord, yCoord, btn)) {
-            if (btn == 1 && this.searchField.isMouseOver(xCoord, yCoord)) {
-                this.searchField.setText("");
-                this.repo.setSearchString("");
-                this.repo.updateView();
-                this.setScrollBar();
-            }
+            return true;
+        }
+
+        // Right-clicking on the search field should clear it
+        if (this.searchField.isMouseOver(xCoord, yCoord) && btn == 1) {
+            this.searchField.setText("");
+            this.repo.setSearchString("");
+            this.repo.updateView();
+            this.setScrollBar();
             return true;
         }
 
@@ -332,4 +335,5 @@ public class FluidTerminalScreen extends AEBaseMEScreen<FluidTerminalContainer>
     protected String getBackground() {
         return "guis/terminal.png";
     }
+
 }