diff --git a/Content.Client/UserInterface/Systems/Storage/Controls/StorageContainer.cs b/Content.Client/UserInterface/Systems/Storage/Controls/StorageContainer.cs
index ba19d2aa90..d79edb2e79 100644
--- a/Content.Client/UserInterface/Systems/Storage/Controls/StorageContainer.cs
+++ b/Content.Client/UserInterface/Systems/Storage/Controls/StorageContainer.cs
@@ -251,23 +251,23 @@ public sealed class StorageContainer : BaseWindow
         {
             for (var x = boundingGrid.Left; x <= boundingGrid.Right; x++)
             {
-                var currentPosition = new Vector2i(x, y);
-                var item = storageComp.StoredItems
-                    .Where(pair => pair.Value.Position == currentPosition)
-                    .FirstOrNull();
-
                 var control = new Control
                 {
                     MinSize = size
                 };
 
-                if (item != null)
+                var currentPosition = new Vector2i(x, y);
+
+                foreach (var item in storageComp.StoredItems)
                 {
-                    var itemEnt = _entity.GetEntity(item.Value.Key);
+                    if (item.Value.Position != currentPosition)
+                        continue;
+
+                    var itemEnt = _entity.GetEntity(item.Key);
 
                     if (_entity.TryGetComponent<ItemComponent>(itemEnt, out var itemEntComponent))
                     {
-                        var gridPiece = new ItemGridPiece((itemEnt, itemEntComponent), item.Value.Value, _entity)
+                        var gridPiece = new ItemGridPiece((itemEnt, itemEntComponent), item.Value, _entity)
                         {
                             MinSize = size,
                         };
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
index 85f1e4a4c7..b4b13accf0 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
@@ -27,6 +27,9 @@
         Structural: 10
   - type: Item
     size: Normal
+    shape:
+    - 0,0,2,0
+    - 1,1,1,2
     sprite: Objects/Weapons/Melee/pickaxe.rsi
   - type: UseDelay
     delay: 1