diff --git a/src/Docfx.App/Build/docfx.app.props b/src/Docfx.App/Build/docfx.app.props
new file mode 100644
index 00000000000..696c16d9ff9
--- /dev/null
+++ b/src/Docfx.App/Build/docfx.app.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <!-- Hide the Docfx templates folder from VS project tree.
+         Can be removed once /~https://github.com/NuGet/Home/issues/4856 is resolved -->
+    <ItemGroup>
+        <Content Update="@(Content)">
+            <Visible Condition="'%(NuGetItemType)' == 'Content' and '%(NuGetPackageId)' == 'docfx.app'">False</Visible>
+        </Content>
+    </ItemGroup>
+</Project>
diff --git a/src/Docfx.App/Docfx.App.csproj b/src/Docfx.App/Docfx.App.csproj
index 6cea09cb8f3..fe7bf48c77a 100644
--- a/src/Docfx.App/Docfx.App.csproj
+++ b/src/Docfx.App/Docfx.App.csproj
@@ -7,6 +7,7 @@
 
   <ItemGroup>
     <Content Include="templates/**" CopyToOutputDirectory="PreserveNewest" PackageCopyToOutput="true" PackagePath="contentFiles/any/any/templates" />
+    <None Include="Build\docfx.app.props" Pack="true" PackagePath="build\" />
   </ItemGroup>
 
   <ItemGroup>