diff --git a/src/main/java/appeng/container/AEBaseContainer.java b/src/main/java/appeng/container/AEBaseContainer.java
index 6163e6b2ecb..d3dd07e15b7 100644
--- a/src/main/java/appeng/container/AEBaseContainer.java
+++ b/src/main/java/appeng/container/AEBaseContainer.java
@@ -964,26 +964,34 @@ public ItemStack slotClick(int slotId, int dragType, ClickType clickTypeIn, @Not
                 if (!draggedStack.isEmpty()) {
                     if (appEngSlot.isItemValid(draggedStack)) {
                         if (slotStack.getItem() == draggedStack.getItem() && slotStack.getMetadata() == draggedStack.getMetadata() && ItemStack.areItemStackTagsEqual(slotStack, draggedStack)) {
-                            var maxSize = Math.max(appEngSlot.getSlotStackLimit(), draggedStack.getMaxStackSize());
-                            var maxInsertable = Math.min(draggedStack.getCount(), maxSize - appEngSlot.getStack().getCount());
-                            var toInsert = Math.min(maxInsertable, dragType == 0 ? maxInsertable : 1);
+                            // Slot size or stack size, whichever is smaller.
+                            var maxSize = Math.min(appEngSlot.getSlotStackLimit(), draggedStack.getMaxStackSize());
 
-                            draggedStack.shrink(toInsert);
-                            slotStack.grow(toInsert);
+                            // The maximum number of items that can be inserted into the slot, non-negative.
+                            var maxInsertable = Math.min(draggedStack.getCount(),
+                                    Math.max(0, maxSize - appEngSlot.getStack().getCount()));
 
-                            slot.onSlotChanged();
-                            return ItemStack.EMPTY;
+                            if (maxInsertable != 0) {
+                                var toInsert = Math.min(maxInsertable, dragType == 0 ? maxInsertable : 1);
+
+                                draggedStack.shrink(toInsert);
+                                slotStack.grow(toInsert);
+
+                                slot.putStack(slot.getStack());
+                                return ItemStack.EMPTY;
+                            }
                         }
                     }
                 }
                 // Fixes taking and halving issues from oversized slots.
                 else if (dragType == 0 || dragType == 1) {
                     if (slot.canTakeStack(player) && !slotStack.isEmpty()) {
+                        var result = slotStack.copy();
                         var toTake = Math.min(slotStack.getCount(), slotStack.getMaxStackSize());
                         this.invPlayer.setItemStack(slot.decrStackSize(dragType == 0 ? toTake : (toTake + 1) / 2));
 
-                        slot.onTake(player, invPlayer.getItemStack());
-                        return ItemStack.EMPTY;
+                        slot.putStack(slot.getStack());
+                        return result;
                     }
                 }