Move workaround code from (edit-page) to (load-item)