Photoshop CC 2017 move tool making other tools reset to the main tool in category

Every time I use the move tool then hotkey to a different tool it will reset the tool I hotkey to back to the main tool in that category.

For example if I am using the pencil tool and hotkey 'B' to it after using the move tool it will change it to the brush tool. Same thing happens when hotkeying to any other tool after using the move tool.

This started after the update last week to Photoshop and is really annoying since I am working on a game project and need to use the pencil tool to make game sprites.

Move tool is the only one causing this issue and none of the other tools when hotkeying from them to another tool have the same issue.