diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 78992eb262..ddfa5e594c 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -6196,23 +6196,28 @@ BattleScript_IllusionOff::
 	return
 
 BattleScript_CottonDownActivates::
-	setbyte gBattlerTarget, 0x1
+	call BattleScript_AbilityPopUp
+	copybyte gEffectBattler, gBattlerTarget
+	savetarget
+	setbyte gBattlerTarget, 0x0
 BattleScript_CottonDownLoop:
 	setstatchanger STAT_SPEED, 1, TRUE
-	statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED | STAT_BUFF_ALLOW_PTR, BattleScript_CottonDownActivatesLoopIncrement
-	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CottonDownEnd
-	call BattleScript_AbilityPopUp
+	jumpifbyteequal gBattlerTarget, gEffectBattler, BattleScript_CottonDownLoopIncrement
+	statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED, BattleScript_CottonDownTargetSpeedCantGoLower
 	setgraphicalstatchangevalues
 	playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
-	setbyte gBattleCommunication STAT_SPEED
-	stattextbuffer BS_TARGET
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
-BattleScript_CottonDownActivatesLoopIncrement:
+	goto BattleScript_CottonDownLoopIncrement
+BattleScript_CottonDownTargetSpeedCantGoLower:
+	printstring STRINGID_STATSWONTDECREASE
+	waitmessage 0x40
+BattleScript_CottonDownLoopIncrement:
 	addbyte gBattlerTarget, 0x1
 	jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_CottonDownLoop
-BattleScript_CottonDownEnd:
-	end3
+BattleScript_CottonDownReturn:
+	restoretarget
+	return
 
 BattleScript_AnticipationActivates::
 	pause 0x5
diff --git a/src/battle_util.c b/src/battle_util.c
index 9527ac6c02..ff93b4120d 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -4627,17 +4627,14 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move
             break;
         case ABILITY_COTTON_DOWN:
             if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
-             && gBattleMons[gBattlerTarget].hp != 0
+             && gBattleMons[gBattlerAttacker].hp != 0
              && !gProtectStructs[gBattlerAttacker].confusionSelfDmg
              && TARGET_TURN_DAMAGED)
             {
-                for (i = 0; i < gBattlersCount; i++)
-                {
-                    gBattlerAttacker = i;
-                    BattleScriptPushCursorAndCallback(BattleScript_CottonDownActivates);
-                    effect++;
-                    break;
-                }
+                gEffectBattler = gBattlerTarget;
+                BattleScriptPushCursor();
+                gBattlescriptCurrInstr = BattleScript_CottonDownActivates;
+                effect++;
             }
             break;
         }