Handle dummy menu clicks explicitly
Merge remote-tracking branch 'origin/iwehrman/v2' into ps-next