Watchlist - fixed double click issue with buttons