First run at fixing bug 1009530 - visual feedback for edit mode