Fix #537, make avatar edit window modal