diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index af63f0b0a39..1cb5d489590 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -126,7 +126,9 @@ export default class BattleScene extends SceneBase {
   public seVolume: number = 1;
   public gameSpeed: integer = 1;
   public damageNumbersMode: integer = 0;
+  public hasRerolled: boolean = false;
   public reroll: boolean = false;
+  public rerollTarget: integer = 1;
   public showMovesetFlyout: boolean = true;
   public showArenaFlyout: boolean = true;
   public showTimeOfDayWidget: boolean = true;
diff --git a/src/system/settings/settings.ts b/src/system/settings/settings.ts
index 7263ae3a3de..775ce74a3d0 100644
--- a/src/system/settings/settings.ts
+++ b/src/system/settings/settings.ts
@@ -102,6 +102,7 @@ export const SettingKeys = {
   Damage_Numbers: "DAMAGE_NUMBERS",
   Move_Animations: "MOVE_ANIMATIONS",
   Show_Stats_on_Level_Up: "SHOW_LEVEL_UP_STATS",
+  Reroll_Target: "REROLL_TARGET",
   Candy_Upgrade_Notification: "CANDY_UPGRADE_NOTIFICATION",
   Candy_Upgrade_Display: "CANDY_UPGRADE_DISPLAY",
   Move_Info: "MOVE_INFO",
@@ -389,6 +390,13 @@ export const Setting: Array<Setting> = [
     default: 1,
     type: SettingType.DISPLAY
   },
+  {
+    key: SettingKeys.Reroll_Target,
+    label: "Reroll Target",
+    options: ["Reroll", "Items", "Shop"],
+    default: 1,
+    type: SettingType.DISPLAY
+  },
   {
     key: SettingKeys.Candy_Upgrade_Notification,
     label: i18next.t("settings:candyUpgradeNotification"),
@@ -709,6 +717,8 @@ export function setSetting(scene: BattleScene, setting: string, value: integer):
   case SettingKeys.Show_Stats_on_Level_Up:
     scene.showLevelUpStats = Setting[index].options[value].value === "On";
     break;
+  case SettingKeys.Reroll_Target:
+    scene.rerollTarget = value;
   case SettingKeys.EXP_Gains_Speed:
     scene.expGainsSpeed = value;
     break;
diff --git a/src/ui/modifier-select-ui-handler.ts b/src/ui/modifier-select-ui-handler.ts
index 016708027ca..53f1cc7512d 100644
--- a/src/ui/modifier-select-ui-handler.ts
+++ b/src/ui/modifier-select-ui-handler.ts
@@ -250,7 +250,11 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
       });
 
       this.setCursor(0);
-      this.setRowCursor(1);
+      if (this.scene.hasRerolled) {
+        this.setRowCursor(this.scene.rerollTarget);
+      } else {
+        this.setRowCursor(1);
+      }
 
       handleTutorial(this.scene, Tutorial.Select_Item).then(() => {
         this.setCursor(0);