Fix edit view bug :relieved: