The workarounds posted above did not work for me. However by changing the zoom level I can get acceptable behaviour. This is cumbersome as changing zoom level is something I often do while exploring maps, and I will need to keep going back to zoom levels that work to edit.