bug 2515
Fixing conflict between merged PM and fix for re-enabling editor box when it should not be.