diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c820934c6..0090a8884 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,6 +10,7 @@
 
     <uses-feature android:name="android.hardware.vr.headtracking" android:required="false" />
     <uses-feature android:name="com.oculus.feature.PASSTHROUGH" android:required="false" />
+    <uses-feature android:name="oculus.software.handtracking" android:required="false" />
     <uses-feature android:name="oculus.software.overlay_keyboard" android:required="false" />
 
     <application
diff --git a/app/src/main/java/com/termux/x11/LorieView.java b/app/src/main/java/com/termux/x11/LorieView.java
index 4727bd4a3..afbc24942 100644
--- a/app/src/main/java/com/termux/x11/LorieView.java
+++ b/app/src/main/java/com/termux/x11/LorieView.java
@@ -138,6 +138,10 @@ void getDimensionsFromSettings() {
         Prefs prefs = MainActivity.getPrefs();
         int width = getMeasuredWidth();
         int height = getMeasuredHeight();
+        if (XrActivity.isEnabled()) {
+            width = 1024;
+            height = 768;
+        }
         int w = width;
         int h = height;
         switch(prefs.displayResolutionMode.get()) {
@@ -180,8 +184,11 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         if (prefs.displayStretch.get()
               || "native".equals(prefs.displayResolutionMode.get())
               || "scaled".equals(prefs.displayResolutionMode.get())) {
-            getHolder().setSizeFromLayout();
-            return;
+
+            if (!XrActivity.isEnabled()) {
+                getHolder().setSizeFromLayout();
+                return;
+            }
         }
 
         getDimensionsFromSettings();
diff --git a/app/src/main/java/com/termux/x11/XrActivity.java b/app/src/main/java/com/termux/x11/XrActivity.java
index c469bc462..9f7023157 100644
--- a/app/src/main/java/com/termux/x11/XrActivity.java
+++ b/app/src/main/java/com/termux/x11/XrActivity.java
@@ -11,6 +11,7 @@
 import android.opengl.GLSurfaceView;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
 import android.os.RemoteException;
 import android.util.Log;
 import android.view.Display;
@@ -48,6 +49,7 @@ public enum RenderParam {
 
     private boolean isImmersive = false;
     private boolean isSBS = false;
+    private boolean keyboardDisabled;
     private long lastEnter;
     private final float[] lastAxes = new float[ControllerAxis.values().length];
     private final boolean[] lastButtons = new boolean[ControllerButton.values().length];
@@ -183,8 +185,27 @@ public void onDrawFrame(GL10 gl10) {
         }
     }
 
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
+        if (hasFocus) {
+            keyboardDisabled = true;
+            new Handler().postDelayed(() -> keyboardDisabled = false, 250);
+        }
+    }
+
     @Override
     public boolean dispatchKeyEvent(KeyEvent event) {
+        // Ignore event madness when disabling software keyboard
+        if (keyboardDisabled) {
+            return true;
+        }
+
+        // Bluetooth/OTG keyboards work properly with the standard flow
+        if (hasWindowFocus()) {
+            return super.dispatchKeyEvent(event);
+        }
+
         // Meta HorizonOS sends up event only (as for in v66)
         if (event.getAction() == KeyEvent.ACTION_UP) {