Unable to change Alarm Mode from Away to Disarmed in one step, I have to select Home first

When I am in Away mode, I have to first navigate to Home mode and then Disarmed mode in order for Disarmed mode to take effect. When I go straight from Away mode to Disarmed mode my motion detection is still active. Is this expected? Is there something subtle I need to enable to make this a 1 step process? Thanks