Merge branch 'master' into sync-vm-and-datacontext

6 years ago · c5629d5b8d
1 changed files with 2 additions and 0 deletions
--- a/src/Avalonia.Controls/Primitives/VisualLayerManager.cs
+++ b/src/Avalonia.Controls/Primitives/VisualLayerManager.cs
@ -67,6 +67,8 @@ namespace Avalonia.Controls.Primitives
        {
            get
            {
+                if (IsPopup)
+                    return null;
                var rv = FindLayer<LightDismissOverlayLayer>();
                if (rv == null)
                {