diff --git a/resources/[essential]/es_extended/client/functions.lua b/resources/[essential]/es_extended/client/functions.lua
index 32a871b9..0d38862a 100644
--- a/resources/[essential]/es_extended/client/functions.lua
+++ b/resources/[essential]/es_extended/client/functions.lua
@@ -940,7 +940,10 @@ ESX.ShowInventory = function()
 						elseif data.current.action == 'remove' then
 
 							if type == 'item_weapon' then
+							
 								TriggerServerEvent('esx:removeInventoryItem', type, item, 1)
+								menu.close()
+								
 							else
 
 								ESX.UI.Menu.Open(
diff --git a/resources/[essential]/es_extended/server/main.lua b/resources/[essential]/es_extended/server/main.lua
index 8f7a47cb..c06d44b8 100644
--- a/resources/[essential]/es_extended/server/main.lua
+++ b/resources/[essential]/es_extended/server/main.lua
@@ -479,8 +479,7 @@ AddEventHandler('esx:removeInventoryItem', function(type, itemName, itemCount)
 
 	elseif type == 'item_weapon' then
 
-		local xPlayer = ESX.GetPlayerFromId(source)
-
+		local xPlayer      = ESX.GetPlayerFromId(source)
 		local weaponLabel  = itemName
 		local weaponName   = nil
 		local weaponPickup = nil