Fix toolbar buttons opening wrong dialogs