fixed perforamnce issue on editing widget