Prevent kodi on TV to switch to main display on desktop- Intel NUC

Hi. I’m using Intel nuc, with dual display. I’m using NUC6i5SYH, with Iris 540 graphics. I have my main display on my monitor, and Kodi on TV, as secondary display. Whenever I turn the TV off, Kodi keeps on coming to the main screen. When I turn on the TV, it doesn’t go back to the TV. I have to go to settings, change display to Fullscreen Display 2.

Anyone having the same issues? I know this is Intel/ AMD specific. I used to have another desktop PC using Nvidia card, with main monitor, and TV connected to the same card, whenever I turn off tv, kodi is still then when I turn on the TV.

Is this a driver issue?