Restore format check for thumb selection

Inappropriately removed by 99beeef3dbaa62f03956f84a9082df5c146ff29f
See #1841