Move asset selection later in order
Move asset selection outside addNewAsset