Prefer combo action

https://www.pivotaltracker.com/story/show/81242476