From cd7c5eb762aa493a1d73a0d1474ee8e0d40f3477 Mon Sep 17 00:00:00 2001
From: Andrey Kunchev <donandren@gmail.com>
Date: Tue, 20 Nov 2018 14:15:57 +0200
Subject: [PATCH] Ensure selected DropDownItem is visible when dropdown is open

---
 src/Avalonia.Controls/DropDown.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Avalonia.Controls/DropDown.cs b/src/Avalonia.Controls/DropDown.cs
index f7cb0aa0ef..93b33e0589 100644
--- a/src/Avalonia.Controls/DropDown.cs
+++ b/src/Avalonia.Controls/DropDown.cs
@@ -246,6 +246,13 @@ namespace Avalonia.Controls
             if (IsDropDownOpen && selectedIndex != -1)
             {
                 var container = ItemContainerGenerator.ContainerFromIndex(selectedIndex);
+
+                if(container == null && SelectedItems.Count > 0)
+                {
+                    ScrollIntoView(SelectedItems[0]);
+                    container = ItemContainerGenerator.ContainerFromIndex(selectedIndex);
+                }
+
                 if (container != null && CanFocus(container))
                 {
                     container.Focus();