Move key mode update location to ensure it has been created