Drawer responds to tombstone toggle; get watching under control