diff --git a/api/unitframes.lua b/api/unitframes.lua
index a8db088e..b3fcb605 100644
--- a/api/unitframes.lua
+++ b/api/unitframes.lua
@@ -772,8 +772,7 @@ function pfUI.uf:EnableScripts()
     f:SetAttribute("unit", f.label .. f.id)
     f:SetAttribute("type1", "target")
     f:SetAttribute("type2", "showmenu")
-
-    RegisterStateDriver(f, 'visibility', "show")
+    RegisterStateDriver(f, 'visibility', string.format("[target=%s%s,exists] show; hide", f.label, f.id))
   else
     f:SetScript("OnClick", pfUI.uf.OnClick)
   end