Improve key bindings in session mode