Thanks!
Looks like Amphetamine is the way to go. Shame it needs a third party app to solve the problem though.