Fix ui problem comes from #26326 Before:  After: 
Fix ui problem comes from #26326 Before:  After: 