diff --git a/P3D/Screens/PC/StorageSystemScreen.vb b/P3D/Screens/PC/StorageSystemScreen.vb
index 0bff37872..837f03f64 100644
--- a/P3D/Screens/PC/StorageSystemScreen.vb
+++ b/P3D/Screens/PC/StorageSystemScreen.vb
@@ -1046,6 +1046,9 @@ Public Class StorageSystemScreen
 
     Private Sub TakeItemPokemon()
         Dim id As Integer = CInt(CursorPosition.X) + CInt((CursorPosition.Y - 1) * 6)
+        If GetBox(CurrentBox).IsBattleBox = True Then
+            id = GetBattleBoxID()
+        End If
         If CursorPosition.X = 6 Then
             If Core.Player.Pokemons(CInt(CursorPosition.Y)).Item IsNot Nothing Then
                 If Core.Player.Pokemons(CInt(CursorPosition.Y)).Item.IsMail And Core.Player.Pokemons(CInt(CursorPosition.Y)).Item.AdditionalData <> "" Then