Dev fix: Change preventDefault location to be general

- See thread 16841