Merge pull request #433 from apoloval/port/432

[PORT] Fix cancel order button not disabled when pressed #432