diff --git a/CMakeLists.txt b/CMakeLists.txt
index 890ce254a1..a9e489ba0d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,7 +133,9 @@ endif()
 
 if (YUZU_USE_BUNDLED_VCPKG)
     if (ANDROID)
-        set(ENV{ANDROID_NDK_HOME} "${ANDROID_NDK}")
+        set(ENV{ANDROID_NDK_HOME} ${ANDROID_NDK})
+        set(VCPKG_ADDITIONAL_FLAGS "--allow-unsupported")
+        set(VCPKG_INSTALL_OPTIONS "--allow-unsupported")
         list(APPEND VCPKG_MANIFEST_FEATURES "android")
 
         if (CMAKE_ANDROID_ARCH_ABI STREQUAL "arm64-v8a")
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
index 7839c26ca0..6d43354f30 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
@@ -150,22 +150,13 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
 
     override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
         if (event.action == KeyEvent.ACTION_DOWN) {
-            if (keyCode == KeyEvent.KEYCODE_ENTER) {
-                // Special case, we do not support multiline input, dismiss the keyboard.
-                val overlayView: View =
-                    this.findViewById(R.id.surface_input_overlay)
-                val im =
-                    overlayView.context.getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
-                im.hideSoftInputFromWindow(overlayView.windowToken, 0)
+            val textChar = event.unicodeChar
+            if (textChar == 0) {
+                // No text, button input.
+                NativeLibrary.submitInlineKeyboardInput(keyCode)
             } else {
-                val textChar = event.unicodeChar
-                if (textChar == 0) {
-                    // No text, button input.
-                    NativeLibrary.submitInlineKeyboardInput(keyCode)
-                } else {
-                    // Text submitted.
-                    NativeLibrary.submitInlineKeyboardText(textChar.toChar().toString())
-                }
+                // Text submitted.
+                NativeLibrary.submitInlineKeyboardText(textChar.toChar().toString())
             }
         }
         return super.onKeyDown(keyCode, event)
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt
index 4f7548e98e..d3be120c41 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt
@@ -332,7 +332,6 @@ class SetupFragment : Fragment() {
                 }
             }
         }
-
     private lateinit var gamesDirCallback: SetupCallback
 
     val getGamesDirectory =