Crop Tool Straightening Messing up when changing tools.

I had scanned a transparency with a series of vertical lines on it. I needed to get the exact size of the lines so I wanted to crop the image and straighten it. When I did this, I was finally able to get it to look straight enough. When I clicked on the Arrow key or Command-Alt-Shift-Click to drag my canvas around to get a better look, suddenly everything is undone.

If I cropped the image (not straightened) before I press enter to accept the crop, selecting the arrow performs the crop like it should The same needs to be true when you straighten an image from the crop tool. Rather than undoing the half hour I spent getting it aligned correctly, just accept the crop and apply it when I click the arrow or try to zoom in or out using my keyboard.