From 82273680f7bcb29c098c0f240e082bbf1fb43928 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 11 Sep 2020 20:35:11 +0200
Subject: [PATCH] Update selected content when containers recycled.

Hopefully fixes #4654 once and for all.
---
 src/Avalonia.Controls/TabControl.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Avalonia.Controls/TabControl.cs b/src/Avalonia.Controls/TabControl.cs
index f7e7126324..306a9d3e6a 100644
--- a/src/Avalonia.Controls/TabControl.cs
+++ b/src/Avalonia.Controls/TabControl.cs
@@ -149,6 +149,12 @@ namespace Avalonia.Controls
             UpdateSelectedContent();
         }
 
+        protected override void OnContainersRecycled(ItemContainerEventArgs e)
+        {
+            base.OnContainersRecycled(e);
+            UpdateSelectedContent();
+        }
+
         private void UpdateSelectedContent()
         {
             if (SelectedIndex == -1)