diff --git a/MinecraftClient/McClient.cs b/MinecraftClient/McClient.cs
index 7e7f0435..198d15d0 100644
--- a/MinecraftClient/McClient.cs
+++ b/MinecraftClient/McClient.cs
@@ -2004,8 +2004,8 @@ namespace MinecraftClient
                 if (item.Count <= spaceLeft)
                 {
                     // Can fit into the stack
-                    item.Count = 0;
                     curItem.Count += item.Count;
+                    item.Count = 0;
 
                     changedSlots.Add(new Tuple<short, Item?>((short)curId, curItem));
                     changedSlots.Add(new Tuple<short, Item?>((short)slotId, null));
@@ -2062,6 +2062,38 @@ namespace MinecraftClient
             };
         }
 
+        private static bool TryGetMirroredPlayerInventoryRange(Container inventory, out int firstWindowSlot, out int lastWindowSlot)
+        {
+            firstWindowSlot = -1;
+            lastWindowSlot = -1;
+
+            if (inventory.Type == ContainerType.PlayerInventory)
+                return false;
+
+            const int mirroredPlayerInventorySlotCount = 36;
+            int slotCount = inventory.Type.SlotCount();
+            if (slotCount < mirroredPlayerInventorySlotCount)
+                return false;
+
+            firstWindowSlot = slotCount - mirroredPlayerInventorySlotCount;
+            lastWindowSlot = slotCount - 1;
+            return true;
+        }
+
+        private static bool TryGetMirroredPlayerInventorySlot(Container inventory, int windowSlot, out int playerInventorySlot)
+        {
+            playerInventorySlot = -1;
+
+            if (!TryGetMirroredPlayerInventoryRange(inventory, out int firstWindowSlot, out int lastWindowSlot))
+                return false;
+
+            if (windowSlot < firstWindowSlot || windowSlot > lastWindowSlot)
+                return false;
+
+            playerInventorySlot = windowSlot - firstWindowSlot + 9;
+            return true;
+        }
+
         private static bool AreSameInventorySlot(Item? left, Item? right)
         {
             if (left is null || left.IsEmpty)
@@ -2093,6 +2125,33 @@ namespace MinecraftClient
             return true;
         }
 
+        private bool SyncPlayerInventorySlotFromWindow(Container? inventory, int windowSlot)
+        {
+            if (inventory is null)
+                return false;
+
+            if (!TryGetMirroredPlayerInventorySlot(inventory, windowSlot, out int playerInventorySlot))
+                return false;
+
+            inventory.Items.TryGetValue(windowSlot, out Item? item);
+            return SetPlayerInventorySlot(playerInventorySlot, item);
+        }
+
+        private bool SyncPlayerInventorySlotsFromWindow(Container? inventory)
+        {
+            if (inventory is null)
+                return false;
+
+            if (!TryGetMirroredPlayerInventoryRange(inventory, out int firstWindowSlot, out int lastWindowSlot))
+                return false;
+
+            bool changed = false;
+            for (int windowSlot = firstWindowSlot; windowSlot <= lastWindowSlot; windowSlot++)
+                changed |= SyncPlayerInventorySlotFromWindow(inventory, windowSlot);
+
+            return changed;
+        }
+
         /// <summary>
         /// Click a slot in the specified window
         /// </summary>
@@ -2157,6 +2216,10 @@ namespace MinecraftClient
                                 playerInventory.Items.Remove(-1);
                             }
 
+                            // Clean up cursor item if count reached zero
+                            if (playerInventory.Items.TryGetValue(-1, out Item? cursorAfterLeft) && cursorAfterLeft.IsEmpty)
+                                playerInventory.Items.Remove(-1);
+
                             if (inventory.Items.ContainsKey(slotId))
                                 changedSlots.Add(new Tuple<short, Item?>((short)slotId, inventory.Items[slotId]));
                             else
@@ -2213,6 +2276,10 @@ namespace MinecraftClient
                                 inventory.Items[slotId] = itemClone;
                                 playerInventory.Items[-1].Count--;
                             }
+
+                            // Clean up cursor item if count reached zero
+                            if (playerInventory.Items.TryGetValue(-1, out Item? cursorItem) && cursorItem.IsEmpty)
+                                playerInventory.Items.Remove(-1);
                         }
                         else
                         {
@@ -2798,6 +2865,11 @@ namespace MinecraftClient
                                         changedSlots.Add(new Tuple<short, Item?>((short)slotId, inventory.Items[slotId]));
                                 }
                             }
+                            if (item!.Count <= 0 && inventory.Items.ContainsKey(slotId))
+                            {
+                                inventory.Items.Remove(slotId);
+                                changedSlots.Add(new Tuple<short, Item?>((short)slotId, null));
+                            }
                         }
                         break;
                     case WindowActionType.DropItem:
@@ -2821,6 +2893,8 @@ namespace MinecraftClient
                 }
             }
 
+            SyncPlayerInventorySlotsFromWindow(inventory);
+
             return handler.SendWindowAction(windowId, slotId, action, item, changedSlots, inventories[windowId].StateID);
         }
 
@@ -3858,8 +3932,15 @@ namespace MinecraftClient
         {
             if (inventories.ContainsKey(inventoryID))
             {
+                // Filter out empty items (Count=0 or Air) that some servers may send
+                foreach (int key in itemList.Where(slot => slot.Value.IsEmpty).Select(slot => slot.Key).ToList())
+                    itemList.Remove(key);
+
                 inventories[inventoryID].Items = itemList;
                 inventories[inventoryID].StateID = stateId;
+                bool playerInventoryChanged = SyncPlayerInventorySlotsFromWindow(inventories[inventoryID]);
+                if (playerInventoryChanged)
+                    DispatchBotEvent(bot => bot.OnInventoryUpdate(0));
                 DispatchBotEvent(bot => bot.OnInventoryUpdate(inventoryID));
             }
         }
@@ -3900,6 +3981,9 @@ namespace MinecraftClient
                             inventories[inventoryID].Items.Remove(slotID);
                     }
                     else inventories[inventoryID].Items[slotID] = item;
+
+                    if (SyncPlayerInventorySlotFromWindow(inventories[inventoryID], slotID))
+                        DispatchBotEvent(bot => bot.OnInventoryUpdate(0));
                 }
             }
             DispatchBotEvent(bot => bot.OnInventoryUpdate(inventoryID));
diff --git a/MinecraftClient/Resources/Translations/Translations.Designer.cs b/MinecraftClient/Resources/Translations/Translations.Designer.cs
index 52ec91ae..2330a891 100644
--- a/MinecraftClient/Resources/Translations/Translations.Designer.cs
+++ b/MinecraftClient/Resources/Translations/Translations.Designer.cs
@@ -4135,7 +4135,7 @@ namespace MinecraftClient {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Shift clicking slot {0} in window #{1}.
+        ///   Looks up a localized string similar to Shift.
         /// </summary>
         internal static string cmd_inventory_shiftclick {
             get {
@@ -4153,7 +4153,7 @@ namespace MinecraftClient {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Shift right-clicking slot {0} in window #{1}.
+        ///   Looks up a localized string similar to Shift right.
         /// </summary>
         internal static string cmd_inventory_shiftrightclick {
             get {
diff --git a/MinecraftClient/Resources/Translations/Translations.resx b/MinecraftClient/Resources/Translations/Translations.resx
index 6052e661..cb2dae94 100644
--- a/MinecraftClient/Resources/Translations/Translations.resx
+++ b/MinecraftClient/Resources/Translations/Translations.resx
@@ -1457,7 +1457,7 @@ Note that parameters in '[]' are optional.</value>
     <value>Right</value>
   </data>
   <data name="cmd.inventory.shiftclick" xml:space="preserve">
-    <value>Shift clicking slot {0} in window #{1}</value>
+    <value>Shift</value>
   </data>
   <data name="cmd.inventory.shiftclick_fail" xml:space="preserve">
     <value>Shift click failed, this may be because this container type is not supported</value>
@@ -2329,7 +2329,7 @@ Logging in...</value>
     <value>Minimum number that you have provided is bigger than the maximum, swapping them around!</value>
   </data>
   <data name="cmd.inventory.shiftrightclick" xml:space="preserve">
-    <value>Shift right-clicking slot {0} in window #{1}</value>
+    <value>Shift right</value>
   </data>
   <data name="mcc.avaliable_profiles" xml:space="preserve">
     <value>Avaliable profiles:</value>