Right click menu behavior update