Fixed generated menu scroll and go back with Esc