diff --git a/zUtilities/Inventory.cpp b/zUtilities/Inventory.cpp
index e326090..512cb67 100644
--- a/zUtilities/Inventory.cpp
+++ b/zUtilities/Inventory.cpp
@@ -35,14 +35,22 @@ namespace GOTHIC_ENGINE {
     if ( !Options::ActivateUsedMunition )
       return;
 
+    if (!player->inventory2.IsOpen())
+        return;
+
+    if (lastActiveMunition) {
+        if (player->inventory2.IsIn(lastActiveMunition, 1) == nullptr
+            && player->GetLeftHand() != lastActiveMunition
+            && player->GetRightHand() != lastActiveMunition) {
+            lastActiveMunition = nullptr;
+        }
+    }
+
     if ( playerStatus.traderNpc ) {
       HandleMunition( nullptr );
       return;
     }
 
-    if ( !player->inventory2.IsOpen() )
-      return;
-
     oCItem* weapon = player->GetEquippedRangedWeapon();
 
     if ( !weapon ) weapon = player->GetWeapon();