Revert last commit
Fix wrong action context issue on editor

Fixes RM-2762, RM-2752