CMS-3968

Live Edit - Context window looses initial mode - final fixes?