diff --git a/apps/openmw/mwmp/LocalPlayer.cpp b/apps/openmw/mwmp/LocalPlayer.cpp
index 674726ef8..b19189429 100644
--- a/apps/openmw/mwmp/LocalPlayer.cpp
+++ b/apps/openmw/mwmp/LocalPlayer.cpp
@@ -993,6 +993,9 @@ void LocalPlayer::setInventory()
     MWWorld::Ptr ptrPlayer = getPlayerPtr();
     MWWorld::ContainerStore &ptrStore = ptrPlayer.getClass().getContainerStore(ptrPlayer);
 
+    // Ensure no item is being drag and dropped
+    MWBase::Environment::get().getWindowManager()->finishDragDrop();
+
     // Clear items in inventory
     ptrStore.clear();