diff --git a/forge-gui-mobile/src/forge/menu/FMenuBar.java b/forge-gui-mobile/src/forge/menu/FMenuBar.java
index 27e8a1a0cdb..4ed70b4ed30 100644
--- a/forge-gui-mobile/src/forge/menu/FMenuBar.java
+++ b/forge-gui-mobile/src/forge/menu/FMenuBar.java
@@ -105,7 +105,7 @@ public class FMenuBar extends Header {
 
     @Override
     public boolean keyDown(int keyCode) {
-        if (keyCode == Input.Keys.BUTTON_L1) {
+        if (keyCode == Input.Keys.BUTTON_SELECT) { //show menu tabs
             setNextSelected();
             return true;
         }
diff --git a/forge-gui-mobile/src/forge/screens/match/MatchScreen.java b/forge-gui-mobile/src/forge/screens/match/MatchScreen.java
index 667567521fd..a69c6574aff 100644
--- a/forge-gui-mobile/src/forge/screens/match/MatchScreen.java
+++ b/forge-gui-mobile/src/forge/screens/match/MatchScreen.java
@@ -579,14 +579,16 @@ public class MatchScreen extends FScreen {
                     } catch (Exception e) {}
                 }
                 break;
-            case Keys.PAGE_DOWN:
+            case Keys.BUTTON_L1: //switch selected panels
                 if (Forge.hasGamepad()) {
                     //nullPotentialListener();
                     selectedPlayerPanel().hideSelectedTab();
                     selectedPlayer--;
                     if (selectedPlayer < 0)
                         selectedPlayer=playerPanelsList.size()-1;
-                    selectedPlayerPanel().setNextSelectedTab(true);
+                    selectedPlayerPanel().closeSelectedTab();
+                    selectedPlayerPanel().getSelectedRow().unselectCurrent();
+                    //selectedPlayerPanel().setNextSelectedTab(true);
                 }
                 break;
             case Keys.ENTER:
diff --git a/forge-gui-mobile/src/forge/screens/match/views/VAvatar.java b/forge-gui-mobile/src/forge/screens/match/views/VAvatar.java
index 569279bf04c..690078093b3 100644
--- a/forge-gui-mobile/src/forge/screens/match/views/VAvatar.java
+++ b/forge-gui-mobile/src/forge/screens/match/views/VAvatar.java
@@ -179,7 +179,7 @@ public class VAvatar extends FDisplayObject {
 
     @Override
     public boolean keyDown(int keyCode) {
-        if (keyCode == Input.Keys.BUTTON_SELECT) {
+        if (keyCode == Input.Keys.PAGE_DOWN) { // left analog down to select current selected panel
             //must invoke in game thread in case a dialog needs to be shown
             if (MatchController.getView().selectedPlayerPanel() != null) {
                 PlayerView selected = MatchController.getView().selectedPlayerPanel().getPlayer();
diff --git a/forge-gui/release-files/GAMEPAD_README.txt b/forge-gui/release-files/GAMEPAD_README.txt
index cdb3056e814..a141668182d 100644
--- a/forge-gui/release-files/GAMEPAD_README.txt
+++ b/forge-gui/release-files/GAMEPAD_README.txt
@@ -57,10 +57,11 @@ Right Trigger - Keep/Mulligan/Cancel/End Turn/Alpha Strike (Bottom Right Button)
 (To select cards on the battlefield, close Zone tabs first (Button B), then use DPAD)
 
 DPAD Up/Down/Left/Right - Selector
-Left Shoulder - Tab Selector/Show
+Left Shoulder - Player Panel Selector
 Right Shoulder - Zone Selector/Show
-Left Analog Down - Switch Player for Selector
+Left Analog Down - Select Player (current selected panel)
 
 Button A - Confirm
 Button B - Cancel/Hide
-Button Y - Show Zoom
\ No newline at end of file
+Button Y - Show Zoom
+Button Back - Show Menu Tabs
\ No newline at end of file