Fix action key retention