diff --git a/Bartender4.lua b/Bartender4.lua
index 413bb2c..dc5ba56 100644
--- a/Bartender4.lua
+++ b/Bartender4.lua
@@ -175,13 +175,7 @@ function Bartender4:UpdateBlizzardVehicle()
 		local vehicleModule = Bartender4:GetModule("Vehicle", true)
 		vehicleModule:Disable()
 		vehicleModule.blizzardVehicle = true
-
-		if not self.hookedVehicle then
-			self.hookedVehicle = true
-			hooksecurefunc("MainMenuBar_ToPlayerArt", function()
-				Bartender4:GetModule("MicroMenu"):RestoreButtons()
-			end)
-		end
+		
 		RegisterStateDriver(MainMenuBar, "visibility", "hide")
 		RegisterStateDriver(ShapeshiftBarFrame, "visibility", "hide")
 		RegisterStateDriver(PossessBarFrame, "visibility", "hide")
@@ -202,7 +196,7 @@ function Bartender4:UpdateBlizzardVehicle()
 				end
 			]])
 		end
-		RegisterStateDriver(self.vehicleController, "vehicle", "[target=vehicle,exists,bonusbar:5]vehicle;novehicle")
+		RegisterStateDriver(self.vehicleController, "vehicle", "[vehicleui]vehicle;novehicle")
 		local btn = "VehicleMenuBarActionButton%d"
 		for i=1,6 do
 			local name = btn:format(i)
diff --git a/MicroMenu.lua b/MicroMenu.lua
index f66a9d4..9d62456 100644
--- a/MicroMenu.lua
+++ b/MicroMenu.lua
@@ -77,7 +77,9 @@ function MicroMenuMod:RestoreButtons()
 end
 
 function MicroMenuMod:UpdateMicroButtons()
-	self:RestoreButtons()
+	if MainMenuBar.state == "player" then
+		self:RestoreButtons()
+	end
 end
 
 MicroMenuBar.button_width = 28