diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index d34938132..6950a06b3 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -326,7 +326,7 @@ static void HandleInputChooseAction(void)
             SwapBallToDisplay(sameBall);
             PlaySE(SE_SELECT);
         }
-        else if (!JOY_HELD(B_LAST_USED_BALL_BUTTON) && sBallSwapped)
+        else if (JOY_NEW(B_BUTTON) || (!JOY_HELD(B_LAST_USED_BALL_BUTTON) && sBallSwapped))
         {
             sAckBallUseBtn = FALSE;
             sBallSwapped = FALSE;
diff --git a/src/battle_interface.c b/src/battle_interface.c
index 09b1200d2..e2cdcff52 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -3256,13 +3256,13 @@ static const struct SpriteSheet sSpriteSheet_LastUsedBallWindow =
     sLastUsedBallWindowGfx, sizeof(sLastUsedBallWindowGfx), LAST_BALL_WINDOW_TAG
 };
 
-#define LAST_USED_BALL_X_F    15
-#define LAST_USED_BALL_X_0    -15
+#define LAST_USED_BALL_X_F    14
+#define LAST_USED_BALL_X_0    -14
 #define LAST_USED_BALL_Y      ((IsDoubleBattle()) ? 78 : 68)
 #define LAST_USED_BALL_Y_BNC  ((IsDoubleBattle()) ? 76 : 66)
 
-#define LAST_BALL_WIN_X_F       (LAST_USED_BALL_X_F - 1)
-#define LAST_BALL_WIN_X_0       (LAST_USED_BALL_X_0 - 1)
+#define LAST_BALL_WIN_X_F       (LAST_USED_BALL_X_F - 0)
+#define LAST_BALL_WIN_X_0       (LAST_USED_BALL_X_0 - 0)
 #define LAST_USED_WIN_Y         (LAST_USED_BALL_Y - 8)
 
 #define sHide  data[0]