I don't think it needs to be removed off the GCD, but it should have a longer duration in addition to a buff icon.