diff --git a/src/android/app/src/main/jni/vr/layers/GameSurfaceLayer.cpp b/src/android/app/src/main/jni/vr/layers/GameSurfaceLayer.cpp
index f204d6756..76f845fea 100644
--- a/src/android/app/src/main/jni/vr/layers/GameSurfaceLayer.cpp
+++ b/src/android/app/src/main/jni/vr/layers/GameSurfaceLayer.cpp
@@ -428,9 +428,7 @@ void GameSurfaceLayer::SetTopPanelFromController(const XrVector3f& controllerPos
     XrVector3f windowPosition =
         CalculatePanelPosition(viewerPosition, controllerPosition, sphereRadius);
     if (windowPosition.z >= -0.5f) { return; }
-    if (XrMath::Vector3f::LengthSq(
-            XrVector3f{windowPosition.x, windowPosition.y, mTopPanel.mInitialPose.position.z} -
-            mLowerPanel.mPanelFromWorld.position) <
+    if (XrMath::Vector3f::LengthSq(windowPosition - mLowerPanel.mPanelFromWorld.position) <
         XrMath::Vector3f::LengthSq(mTopPanel.mInitialPose.position -
                                    mLowerPanel.mInitialPose.position)) {
         return;