Fix disable/enabling of buttons during modals