diff --git a/build/SharedVersion.props b/build/SharedVersion.props
index 240300b7e5..95556af160 100644
--- a/build/SharedVersion.props
+++ b/build/SharedVersion.props
@@ -15,7 +15,8 @@
     <PackageTags>avalonia;avaloniaui;mvvm;rx;reactive extensions;android;ios;mac;forms;wpf;net;netstandard;net461;uwp;xamarin</PackageTags>
     <PackageReleaseNotes>https://github.com/AvaloniaUI/Avalonia/releases</PackageReleaseNotes>
     <RepositoryType>git</RepositoryType>
-    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\avalonia.snk</AssemblyOriginatorKeyFile>    
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\avalonia.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>True</SignAssembly>
   </PropertyGroup>
 
   <ItemGroup Label="PackageIcon">
diff --git a/src/Avalonia.Controls/Primitives/VisualLayerManager.cs b/src/Avalonia.Controls/Primitives/VisualLayerManager.cs
index 457a9ea282..d8d3450c6f 100644
--- 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)
                 {