diff --git a/modules/actionbar.lua b/modules/actionbar.lua
index b74496cc..004ef4d7 100644
--- a/modules/actionbar.lua
+++ b/modules/actionbar.lua
@@ -533,6 +533,9 @@ pfUI:RegisterModule("actionbar", function ()
     button:SetWidth(C.bars.icon_size)
     button:SetHeight(C.bars.icon_size)
 
+    local cooldown = _G["ShapeshiftButton"..i..'Cooldown']
+    cooldown.pfCooldownType = "NOGCD"
+
     local icon = _G["ShapeshiftButton"..i..'Icon']
     icon:SetParent(button)
     icon:SetAllPoints(button)
diff --git a/pfUI.toc b/pfUI.toc
index b664c85a..873d1a05 100644
--- a/pfUI.toc
+++ b/pfUI.toc
@@ -2,7 +2,7 @@
 ## Title: |cff33ffccpf|cffffffffUI
 ## Author: Shagu
 ## Notes: A complete user interface replacement.
-## Version: 3.8.7
+## Version: 3.8.8
 ## SavedVariables: pfUI_profiles, pfUI_gold
 ## SavedVariablesPerCharacter: pfUI_config, pfUI_init, pfUI_playerDB