Fix quick edit Closes #2130