Improve right menu support