Fix issue with F1 not always setting disabled flag