Fix duplicate OK and ENTER button on same screen