[PoE 2] - WASD movement and Controller input method

I have been regularly switch from using the WASD movement input method and the Controller input Method depending on if I am playing on my PC or Steam streaming to my couch gaming setup. I noticed when switching from Controller back to WASD, the Input method will default to the click to move input method when logging on my character. I would recommend, if possible, when logging onto a character after switching from Controller it will default to the last Mouse & keyboard input method instead of only click to move.