Separate handler for action mode