Fix edit pop up partially