(Hopefully) improve new compose button state management