Cell Snap? Auto Focus Issue.

I see that this has been an issue before. When  "Auto-Focus Tool Settings" is turned on, it causes a problem with Snapping in cells to their origin point. They actually snap to the cursor instead of the origin point.

Is there a fix for this besides turning off  "Auto-Focus Tool Settings"  (which I really need on)?