Suppose we have a Hamiltonian operator $\hat{H}$ and another operator $\hat{A}$ such that $[\hat{H},\hat{A}]=0$. Then, if the spectrum of $\hat{H}$ is non-degenerate, from my understanding the eigenvectors of $\hat{H}$ are also eigenvectors of $\hat{A}$. In the case where $\hat{H}$ admits some degeneracy I don't believe this is true. From my understanding there still exists eigenvectors shared by both operators, but a change of basis may be required.
How may one find eigenvectors that diagonalize $\hat{H}$ and $\hat{A}$ simultaneously if $\hat{H}$ admits some degeneracy?