diff --git a/src/tabs.js b/src/tabs.js
index 41a1264c6..ee82cd641 100644
--- a/src/tabs.js
+++ b/src/tabs.js
@@ -26,6 +26,7 @@ const utils = require('./utils')
 // options.showMain(div, subject) function to show subject in div when tab selected
 // options.renderTabSettings  function(subject, domContainer)
 // options.renderTabSettings  like showMain but when user has held Alt down
+// options.onClose            if given, will present a cancelButton next to tabs that calls this optional method
 //
 
 UI.tabs.tabWidget = function (options) {
@@ -41,6 +42,7 @@ UI.tabs.tabWidget = function (options) {
   var wholetable = box.appendChild(dom.createElement('table'))
   var mainTR, mainTD, tabTR
   var tabContainer, tabElement
+  var onClose = options.onClose
 
   var isLight = function (x) {
     var total = 0
@@ -140,7 +142,11 @@ UI.tabs.tabWidget = function (options) {
 
   var resetTabStyle = function () {
     for (var i = 0; i < tabContainer.children.length; i++) {
-      tabContainer.children[i].firstChild.setAttribute('style', unselectedStyle)
+      const tab = tabContainer.children[i]
+      if (tab.classList.contains('unstyled')) {
+        continue
+      }
+      tab.firstChild.setAttribute('style', unselectedStyle)
     }
   }
   var resetBodyStyle = function () {
@@ -193,14 +199,14 @@ UI.tabs.tabWidget = function (options) {
   var orderedSync = function () {
     var items = getItems()
     if (!vertical) {
-      mainTD.setAttribute('colspan', items.length)
+      mainTD.setAttribute('colspan', items.length + (onClose ? 1 : 0))
     }
     var slot, i, j, left, right
     var differ = false
     // Find how many match at each end
     for (left = 0; left < tabContainer.children.length; left++) {
       slot = tabContainer.children[left]
-      if (left >= items.length || !slot.subject.sameTerm(items[left])) {
+      if (left >= items.length || (slot.subject && !slot.subject.sameTerm(items[left]))) {
         differ = true
         break
       }
@@ -211,7 +217,7 @@ UI.tabs.tabWidget = function (options) {
     for (right = tabContainer.children.length - 1; right >= 0; right--) {
       slot = tabContainer.children[right]
       j = right - tabContainer.children.length + items.length
-      if (!slot.subject.sameTerm(items[j])) {
+      if (slot.subject && !slot.subject.sameTerm(items[j])) {
         break
       }
     }
@@ -238,13 +244,16 @@ UI.tabs.tabWidget = function (options) {
         bodyContainer.insertBefore(newBodyTR, bodyContainer.children[left + i])
       }
     }
+    if (onClose) {
+      addCancelButton(tabContainer)
+    }
   }
 
-// UNMAINTAINED
+  // UNMAINTAINED
   var unorderedSync = function () {
     var items = getItems()
     if (!vertical) {
-      mainTD.setAttribute('colspan', items.length)
+      mainTD.setAttribute('colspan', items.length + (onClose ? 1 : 0))
     }
     var slot, i, j, found, pair
     var missing = []
@@ -280,6 +289,10 @@ UI.tabs.tabWidget = function (options) {
         tabContainer.removeChild(slot)
       }
     }
+
+    if (onClose) {
+      addCancelButton(tabContainer)
+    }
   }
 
   var sync = function () {
@@ -310,4 +323,22 @@ UI.tabs.tabWidget = function (options) {
     tabContainer.children[0].firstChild.click() // Open first tab
   }
   return box
+
+  function addCancelButton (tabContainer) {
+    if (tabContainer.dataset.onCloseSet) {
+      // @@ TODO: this is only here to make the tests work
+      // Discussion at https://github.com/solid/solid-ui/pull/110#issuecomment-527080663
+      const existingCancelButton = tabContainer.querySelector('.unstyled')
+      tabContainer.removeChild(existingCancelButton)
+    }
+    const extraTab = dom.createElement(tabElement)
+    extraTab.classList.add('unstyled')
+    if (tabElement === 'td') {
+      extraTab.style.textAlign = 'right'
+    }
+    const cancelButton = UI.widgets.cancelButton(dom, onClose)
+    extraTab.appendChild(cancelButton)
+    tabContainer.appendChild(extraTab)
+    tabContainer.dataset.onCloseSet = 'true'
+  }
 }