An improved shift- and rotational-invariant filter using wavelet transform and circular harmonic filtering at the same time is proposed. Computer simulation has shown that the filter is better than phase-only circular harmonic filter in peak sharpness, discriminating ability, SNR and tolerance of position error of the filter. Furthermore, this filter possesses high diffraction efficiency.