diff --git a/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java b/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
index e5870645d..721943ceb 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
@@ -197,12 +197,11 @@ public class BaseMainActivity extends LoggableActivity {
            
             // toggleGui(null);
             this.drawerLayout.closeDrawers();
-/*
+
             mKeyHandlerView = findViewById(R.id.main_key_handler);
             mKeyHandlerView.setSingleLine(false);
             mKeyHandlerView.clearFocus();
-            mKeyHandlerView.setVisibility(View.GONE);
-*/
+            
             AndroidLWJGLKeycode.isBackspaceAfterChar = true; // mVersionInfo.minimumLauncherVersion >= 18;
 
             placeMouseAt(CallbackBridge.windowWidth / 2, CallbackBridge.windowHeight / 2);
diff --git a/app/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlButton.java b/app/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlButton.java
index 4b13d5406..dbd5d21a5 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlButton.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlButton.java
@@ -86,7 +86,10 @@ public class ControlButton extends Button implements OnLongClickListener, OnTouc
             // A non-special button or inside custom controls screen so skip listener
         } else if (properties.specialButtonListener instanceof View.OnClickListener) {
             setOnClickListener((View.OnClickListener) properties.specialButtonListener);
+            setOnLongClickListener(null);
+            setOnTouchListener(null);
         } else if (properties.specialButtonListener instanceof View.OnTouchListener) {
+            setOnLongClickListener(null);
             setOnTouchListener((View.OnTouchListener) properties.specialButtonListener);
         } else {
             throw new IllegalArgumentException("Field " + ControlData.class.getName() + ".specialButtonListener must be View.OnClickListener or View.OnTouchListener, but is " + properties.specialButtonListener.getClass().getName());
diff --git a/app/src/main/res/layout/main_with_customctrl.xml b/app/src/main/res/layout/main_with_customctrl.xml
index a8b2c1d25..d43b35d0b 100644
--- a/app/src/main/res/layout/main_with_customctrl.xml
+++ b/app/src/main/res/layout/main_with_customctrl.xml
@@ -17,12 +17,12 @@
 			android:id="@+id/main_control_layout"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent">
-<!--
+
 			<net.kdt.pojavlaunch.CapturedEditText
 				android:layout_height="match_parent"
 				android:layout_width="match_parent"
 				android:id="@+id/main_key_handler"/>
--->
+
 			<net.kdt.pojavlaunch.MinecraftGLView
 				android:id="@+id/main_game_render_view"
 				android:layout_width="fill_parent"