Fixed issue where chaining active required two clicks