Go to Edit > Preferences > Interface, uncheck "Enable Floating Document Window Docking," and then exit and reload Photoshop.

(Note: even with the above preference unchecked, you can still dock the windows as tabs, but you will now have to hold down the Control key to do it.)

Does this solve your problem?