Fixed issue with modal rebinding to button every it popped up