diff --git a/StructLayout/LayoutWindow/LayoutWindowCommand.cs b/StructLayout/LayoutWindow/LayoutWindowCommand.cs
index e0dad7d..9d93693 100644
--- a/StructLayout/LayoutWindow/LayoutWindowCommand.cs
+++ b/StructLayout/LayoutWindow/LayoutWindowCommand.cs
@@ -86,14 +86,13 @@ public static async Task InitializeAsync(AsyncPackage package)
         /// <param name="e">The event args.</param>
         private void Execute(object sender, EventArgs e)
         {
-            this.package.JoinableTaskFactory.RunAsync(async delegate
+            ThreadHelper.ThrowIfNotOnUIThread();
+
+            LayoutWindow win = EditorUtils.GetLayoutWindow(true);
+            if (win != null)
             {
-                ToolWindowPane window = await this.package.ShowToolWindowAsync(typeof(LayoutWindow), 0, true, this.package.DisposalToken);
-                if ((null == window) || (null == window.Frame))
-                {
-                    throw new NotSupportedException("Cannot create tool window");
-                }
-            });
+                EditorUtils.FocusWindow(win);
+            }
         }
     }
 }
diff --git a/StructLayout/StructLayout.csproj b/StructLayout/StructLayout.csproj
index 09c52e9..7e4f762 100644
--- a/StructLayout/StructLayout.csproj
+++ b/StructLayout/StructLayout.csproj
@@ -116,8 +116,7 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="16.0.205" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.6.2051" />
+    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="15.0.1" ExcludeAssets="runtime" />
   </ItemGroup>
   <ItemGroup>
     <Page Include="Editor\ParseMessageControl.xaml">
diff --git a/StructLayout/source.extension.vsixmanifest b/StructLayout/source.extension.vsixmanifest
index eae81ac..8cae492 100644
--- a/StructLayout/source.extension.vsixmanifest
+++ b/StructLayout/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="StructLayout.ae9caa76-a538-4c6c-bff5-9e0a61e6b728" Version="0.4.4" Language="en-US" Publisher="Ramon Viladomat" />
+        <Identity Id="StructLayout.ae9caa76-a538-4c6c-bff5-9e0a61e6b728" Version="0.4.5" Language="en-US" Publisher="Ramon Viladomat" />
         <DisplayName>Struct Layout</DisplayName>
         <Description xml:space="preserve">C++ struct memory layout viewer</Description>
         <MoreInfo>https://github.com/Viladoman/StructLayout</MoreInfo>
@@ -10,13 +10,13 @@
         <Tags>cpp memory struct class debugging cache cacheline layout</Tags>
     </Metadata>
     <Installation>
-        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0, 17.0)" />
+        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0, 17.0)" />
     </Installation>
     <Dependencies>
         <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
     </Dependencies>
     <Prerequisites>
-        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,17.0)" DisplayName="Visual Studio core editor" />
+        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,17.0)" DisplayName="Visual Studio core editor" />
     </Prerequisites>
     <Assets>
         <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />