diff --git a/Button.lua b/Button.lua
index 006f971..8e170e8 100644
--- a/Button.lua
+++ b/Button.lua
@@ -188,16 +188,14 @@ function Button:Update()
 		self.border:Hide()
 	end
 	
-	if ( GameTooltip:IsOwned(self) ) then
+	if ( GameTooltip:GetOwner() == self) then
 		self:SetTooltip()
-	else
-		self.UpdateTooltip = nil
 	end
 	
-	if self.parent.config.hidemacrotext then
-		self.macroName:SetText("")
-	else
+	if not IsConsumableAction(action) and not IsStackableAction(action) and not self.parent.config.hidemacrotext then
 		self.macroName:SetText(GetActionText(action))
+	else
+		self.macroName:SetText("")
 	end
 	
 end
diff --git a/Options.lua b/Options.lua
index 37c8525..04a0e74 100644
--- a/Options.lua
+++ b/Options.lua
@@ -112,7 +112,6 @@ do
 				},
 			},
 		}
-		
 		return tbl
 	end
 end