diff --git a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
index c793f5be..ebaa04c5 100644
--- a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
+++ b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
@@ -286,13 +286,13 @@
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Main\MainWindowContent.xaml.cs">
       <DependentUpon>MainWindowContent.xaml</DependentUpon>
     </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Main\NonClientAreaContent.cs">
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Main\NonClientAreaContent.xaml.cs">
       <DependentUpon>NonClientAreaContent.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Main\ProjectsView.xaml.cs">
       <DependentUpon>ProjectsView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Main\PracticalDemo.cs">
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Main\PracticalDemo.xaml.cs">
       <DependentUpon>PracticalDemo.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Main\ContributorsView.xaml.cs">
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/NonClientAreaContent.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/NonClientAreaContent.xaml.cs
similarity index 100%
rename from src/Shared/HandyControlDemo_Shared/UserControl/Main/NonClientAreaContent.cs
rename to src/Shared/HandyControlDemo_Shared/UserControl/Main/NonClientAreaContent.xaml.cs
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/PracticalDemo.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/PracticalDemo.xaml.cs
similarity index 100%
rename from src/Shared/HandyControlDemo_Shared/UserControl/Main/PracticalDemo.cs
rename to src/Shared/HandyControlDemo_Shared/UserControl/Main/PracticalDemo.xaml.cs