That is how I deal with it as well. I just wanted to throw my experience out there because the reported issue sounds similar to what I have a experiences on a similar model laptop.

As a side note I also use a xps 13 don’t remember the model but I have found they do not properly implement the sleep function and can cause issues when coming out of sleep. I have seen the computer act fine till I open something and then crash.