Photoshop 24 changes to dialogue window behaviour

I've upgraded to photoshop 24 and now pressing the esc key on a pop up window opens the adobe help website rather than just closing the window. It also seems to choose ok rather than cancel. In the passed I'd just click esc and the window would disappear as if I'd clicked cancel on the dialogue window 

Two examples that are really annoying me and slowing me down: I click on a smart object with the brush tool by accident, rather than the layer I want to paint on. Clicking escape now rasterises the object and opens the help page, rather than just closing the pop up window and leaving the smart object. (there is no option to tick don't show again on that window)

I work with hundreds of layers, sometimes to quckly check if a layer is empty I command click it to see if it tells me no pixels were selected, then click escape to close it. Now I end up opening the help window.

I have to work very fast (I illustrate a book a week), and these new changes really slow me as I'm so used to working the way I have done for 15 years. The smart object thing is a real problem as I automatically click escape nd then rasterize the object without noticing, instead I have to actually click the cancel button on the screen, there is no short cut to cancel the window. And having websites open all the time also slows me down

Does anyone know a way to revert back to the old way of working without reverting to the old version?