diff --git a/lib/ui/tab.go b/lib/ui/tab.go
index a67bdab..3be512f 100644
--- a/lib/ui/tab.go
+++ b/lib/ui/tab.go
@@ -74,10 +74,13 @@ func (tabs *Tabs) invalidateChild(d Drawable) {
 
 func (tabs *Tabs) Remove(content Drawable) {
 	indexToRemove := -1
+	removeTab := func() {}
 	for i, tab := range tabs.Tabs {
 		if tab.Content == content {
-			tabs.Tabs = append(tabs.Tabs[:i], tabs.Tabs[i+1:]...)
-			tabs.removeHistory(i)
+			removeTab = func() {
+				tabs.Tabs = append(tabs.Tabs[:i], tabs.Tabs[i+1:]...)
+				tabs.removeHistory(i)
+			}
 			indexToRemove = i
 			break
 		}
@@ -99,6 +102,7 @@ func (tabs *Tabs) Remove(content Drawable) {
 		// selected tab is now one to the left of where it was
 		tabs.Selected--
 	}
+	removeTab()
 	tabs.TabStrip.Invalidate()
 }