Selection done + Contextmenu fix