Change order of operations when an action is selected to better work on iOS 8