diff --git a/P3D/Battle/BattleSystemV2/BattleMenu.vb b/P3D/Battle/BattleSystemV2/BattleMenu.vb
index 276788925..1323c2311 100644
--- a/P3D/Battle/BattleSystemV2/BattleMenu.vb
+++ b/P3D/Battle/BattleSystemV2/BattleMenu.vb
@@ -913,6 +913,10 @@
                 _moveMenuItemList.Clear()
                 BattleScreen.ClearMoveMenuTime = False
             End If
+            If _moveMenuIndex > _moveMenuItemList.Count - 1 Then
+                _moveMenuIndex = 0
+                _moveMenuNextIndex = 0
+            End If
 
             If _moveMenuChoseMove = True Then
                 _moveMenuAlpha -= 15