diff --git a/interface/resources/controllers/standard_navigation.json b/interface/resources/controllers/standard_navigation.json
index 36cab8be8f..a557ba7b45 100644
--- a/interface/resources/controllers/standard_navigation.json
+++ b/interface/resources/controllers/standard_navigation.json
@@ -6,9 +6,7 @@
         { "from": "Standard.DL", "to": "Actions.UiNavLateral", "filters": "invert" },
         { "from": "Standard.DR", "to": "Actions.UiNavLateral" },
         { "from": "Standard.LB", "to": "Actions.UiNavGroup","filters": "invert" },
-        { "from": "Standard.RB", "to": "Actions.UiNavGroup" },
-        { "from": [ "Standard.A", "Standard.X" ], "to": "Actions.UiNavSelect" },
-        { "from": [ "Standard.B", "Standard.Y" ], "to": "Actions.UiNavBack" }
+        { "from": "Standard.RB", "to": "Actions.UiNavGroup" }
     ]
 }
 
diff --git a/interface/resources/controllers/xbox.json b/interface/resources/controllers/xbox.json
index 0b4a992fa7..08088f50d9 100644
--- a/interface/resources/controllers/xbox.json
+++ b/interface/resources/controllers/xbox.json
@@ -56,6 +56,9 @@
         { "from": "GamePad.A", "to": "Standard.A" },
         { "from": "GamePad.B", "to": "Standard.B" },
         { "from": "GamePad.X", "to": "Standard.X" },
-        { "from": "GamePad.Y", "to": "Standard.Y" }
+        { "from": "GamePad.Y", "to": "Standard.Y" },
+
+        { "from": [ "Standard.A", "Standard.X" ], "to": "Actions.UiNavSelect" },
+        { "from": [ "Standard.B", "Standard.Y" ], "to": "Actions.UiNavBack" }
     ]
 }
diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js
index 903065dd2e..6b18f06059 100644
--- a/scripts/system/libraries/WebTablet.js
+++ b/scripts/system/libraries/WebTablet.js
@@ -64,9 +64,10 @@ function calcSpawnInfo(hand, height) {
     } else {
         var front = Quat.getFront(Camera.orientation);
         finalPosition = Vec3.sum(Camera.position, Vec3.multiply(0.6, front));
+        var orientation = Quat.lookAt({x: 0, y: 0, z: 0}, front, {x: 0, y: 1, z: 0});
         return {
             position: finalPosition,
-            rotation: Quat.multiply(Camera.orientation, {x: 0, y: 1, z: 0, w: 0})
+            rotation: Quat.multiply(orientation, {x: 0, y: 1, z: 0, w: 0})
         };
     }
 }