Add no-save and no-restore options to shortcut.