Fix restore from keyboard
automerge: e551539

* commit 'e5515395f11ce3f6ba5ddebb1fc029c51f51b8b3':
  Fix restore from keyboard