diff --git a/container/apptabs.go b/container/apptabs.go
index 45093fa5c1..68335507c1 100644
--- a/container/apptabs.go
+++ b/container/apptabs.go
@@ -341,9 +341,8 @@ func (r *appTabsRenderer) buildTabButtons(count int) *fyne.Container {
 		item := r.appTabs.Items[i]
 		button, ok := r.buttonCache[item]
 		if !ok {
-			index := i // capture
 			button = &tabButton{
-				onTapped: func() { r.appTabs.SelectIndex(index) },
+				onTapped: func() { r.appTabs.Select(item) },
 			}
 			r.buttonCache[item] = button
 		}