Handle interface disabled/enabled more consistently