Scanpy matrixplot dendrogram by both axes

Is there a workaround to apply hierarchical clustering to both axes in matrixplot? ie both adata.var_names and adata.obs.leiden
It seems groupby only accepts adata.obs columns for the dendrogram.
This would be super useful to visualise marker correlations in clusters for cell phenotyping in multiplex imaging data