diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UISmelterBasic.kt b/src/net/torvald/terrarum/modulebasegame/ui/UISmelterBasic.kt
index 87272e8f2..c886ab1af 100644
--- a/src/net/torvald/terrarum/modulebasegame/ui/UISmelterBasic.kt
+++ b/src/net/torvald/terrarum/modulebasegame/ui/UISmelterBasic.kt
@@ -44,21 +44,25 @@ class UISmelterBasic(val smelter: FixtureSmelterBasic) : UICanvas(
             // oreslot
             if (amount != null && gameItem != null) {
                 if (clickedOn == 1) {
-                    getPlayerInventory().remove(gameItem.dynamicID, amount)
-
-                    if (smelter.oreItem == null)
+                    if (smelter.oreItem == null) {
+                        getPlayerInventory().remove(gameItem.dynamicID, amount)
                         smelter.oreItem = InventoryPair(gameItem.dynamicID, amount)
-                    else
+                    }
+                    else if (smelter.oreItem!!.itm == gameItem.dynamicID) {
+                        getPlayerInventory().remove(gameItem.dynamicID, amount)
                         smelter.oreItem!!.qty += amount
+                    }
                 }
                 // firebox
                 else if (clickedOn == 2) {
-                    getPlayerInventory().remove(gameItem.dynamicID, amount)
-
-                    if (smelter.fireboxItem == null)
+                    if (smelter.fireboxItem == null) {
+                        getPlayerInventory().remove(gameItem.dynamicID, amount)
                         smelter.fireboxItem = InventoryPair(gameItem.dynamicID, amount)
-                    else
+                    }
+                    else if (smelter.fireboxItem!!.itm == gameItem.dynamicID) {
+                        getPlayerInventory().remove(gameItem.dynamicID, amount)
                         smelter.fireboxItem!!.qty += amount
+                    }
                 }
             }
 
diff --git a/src/net/torvald/terrarum/ui/UIItemInventoryElemSimple.kt b/src/net/torvald/terrarum/ui/UIItemInventoryElemSimple.kt
index 9d447c8f9..7bbe974f6 100644
--- a/src/net/torvald/terrarum/ui/UIItemInventoryElemSimple.kt
+++ b/src/net/torvald/terrarum/ui/UIItemInventoryElemSimple.kt
@@ -145,10 +145,6 @@ class UIItemInventoryElemSimple(
                 tooltipShowing[hash] = true
 //                printdbg(this, tooltipShowing.entries)
             }
-            else if (item == null || !mouseUp) {
-                tooltipShowing[hash] = false
-            }
-
         }
         else {
 
@@ -160,6 +156,10 @@ class UIItemInventoryElemSimple(
 
         }
 
+        if (item == null || !mouseUp) {
+            tooltipShowing[hash] = false
+        }
+
         // see IFs above?
         batch.color = Color.WHITE
 
diff --git a/src/net/torvald/terrarum/ui/UIItemInventoryElemWide.kt b/src/net/torvald/terrarum/ui/UIItemInventoryElemWide.kt
index c49e4cf9d..fa6dc7a7d 100644
--- a/src/net/torvald/terrarum/ui/UIItemInventoryElemWide.kt
+++ b/src/net/torvald/terrarum/ui/UIItemInventoryElemWide.kt
@@ -177,9 +177,10 @@ class UIItemInventoryElemWide(
                 tooltipShowing[hash] = true
 //                printdbg(this, tooltipShowing.entries)
             }
-            else if (item == null || !mouseUp) {
-                tooltipShowing[hash] = false
-            }
+        }
+
+        if (item == null || !mouseUp) {
+            tooltipShowing[hash] = false
         }
 
         // see IFs above?