Added support for selecting tabs once selected