Fix ui problem comes from #26326 Before:  After: 
c59264c9
77d69274