Adding fix to editor problems

Change-Id: I67395f53c19d5580e72b37c4ce10fad94bbae915