Bug 1025963 - Edit mode follow-up r=me