The Red Devils boss knows that Shaw has endured a difficult season in more ways than one.
Injury problems and the emergence of Brandon Williams as competition have made life difficult for the England star.
But he showed his best form, getting a goal and assist in a 3-0 win over Derby County.
On Shaw, Solskjaer told MUTV: "He's coming on, Luke, he's getting better and better and he's in good form now, at left-back or left centre-back.
"Of course after his injuries he's worked hard and he deserves it."