diff --git a/src/mono/sample/wasm/browser-bench/Wasm.Browser.Bench.Sample.csproj b/src/mono/sample/wasm/browser-bench/Wasm.Browser.Bench.Sample.csproj
index bb523ade9a2a4c..752927021914cb 100644
--- a/src/mono/sample/wasm/browser-bench/Wasm.Browser.Bench.Sample.csproj
+++ b/src/mono/sample/wasm/browser-bench/Wasm.Browser.Bench.Sample.csproj
@@ -84,25 +84,36 @@
         DestinationFolder="$(MSBuildThisFileDirectory)/bin/$(Configuration)/AppBundle/blazor-template/%(RecursiveDir)" />
   </Target>
 
-  <Target Name="BuildBrowserFrame" AfterTargets="BuildSampleInTree" Condition="'$(BrowserStartup)' == 'true'" DependsOnTargets="BuildWBT">
+  <Target Name="PrepareBrowserTemplate" Condition="!Exists('$(MonoProjectRoot)sample/wasm/browser-frame/browser-frame')">
     <ItemGroup>
         <OverrideFiles Include="$(MonoProjectRoot)wasm/Wasm.Build.Tests/data/WasmOverridePacks.targets" />
         <OverrideFiles Include="$(MonoProjectRoot)wasm/Wasm.Build.Tests/data/Blazor.Directory.Build.targets" />
-        <OverrideDestFiles Include="$(MonoProjectRoot)sample/wasm/browser-frame/WasmOverridePacks.targets" />
-        <OverrideDestFiles Include="$(MonoProjectRoot)sample/wasm/browser-frame/Directory.Build.targets" />
+        <OverrideFiles Include="$(MonoProjectRoot)sample/wasm/browser-frame/AppStart.cs" />
+        <OverrideFiles Include="$(MonoProjectRoot)sample/wasm/browser-frame/frame.js" />
+        <OverrideDestFiles Include="$(MonoProjectRoot)sample/wasm/browser-frame/browser-frame/WasmOverridePacks.targets" />
+        <OverrideDestFiles Include="$(MonoProjectRoot)sample/wasm/browser-frame/browser-frame/Directory.Build.targets" />
+        <OverrideDestFiles Include="$(MonoProjectRoot)sample/wasm/browser-frame/browser-frame/AppStart.cs" />
+        <OverrideDestFiles Include="$(MonoProjectRoot)sample/wasm/browser-frame/browser-frame/wwwroot/frame.js" />
     </ItemGroup>
 
+    <MakeDir Directories="$(MonoProjectRoot)sample/wasm/blazor-frame/browser-frame"/>
     <Copy SourceFiles="@(OverrideFiles)" DestinationFiles="@(OverrideDestFiles)" UseSymbolicLinksIfPossible="true" OverwriteReadOnlyFiles="true" />
 
     <WriteLinesToFile
-        File="$(MSBuildThisFileDirectory)../browser-frame/nuget.config"
+        File="$(MSBuildThisFileDirectory)../browser-frame/browser-frame/nuget.config"
         Overwrite="true"
         Lines="$(NugetConfigContent)" />
 
-    <Exec EnvironmentVariables="MSBuildSDKsPath=;DOTNET_ROOT=$(ArtifactsDir)bin/dotnet-latest;PATH=$(ArtifactsDir)bin/dotnet-latest:$(PATH)" WorkingDirectory="$(MSBuildThisFileDirectory)../browser-frame" Command="dotnet publish browser-frame.csproj -c $(Configuration) -p:WBTOverrideRuntimePack=true -p:TargetOS=browser -p:TargetArchitecture=wasm $(BuildAdditionalArgs)" />
+    <Exec EnvironmentVariables="MSBuildSDKsPath=;DOTNET_ROOT=$(ArtifactsDir)bin/dotnet-latest;PATH=$(ArtifactsDir)bin/dotnet-latest:$(PATH)" WorkingDirectory="$(MSBuildThisFileDirectory)../browser-frame/browser-frame/" Command="dotnet new wasmbrowser" />
+    <Exec WorkingDirectory="$(MSBuildThisFileDirectory)../browser-frame" Command="git apply browser-frame.diff" />
+  </Target>
+
+  <Target Name="BuildBrowserFrame" AfterTargets="BuildSampleInTree" Condition="'$(BrowserStartup)' == 'true'" DependsOnTargets="BuildWBT;PrepareBrowserTemplate">
+
+    <Exec EnvironmentVariables="MSBuildSDKsPath=;DOTNET_ROOT=$(ArtifactsDir)bin/dotnet-latest;PATH=$(ArtifactsDir)bin/dotnet-latest:$(PATH)" WorkingDirectory="$(MSBuildThisFileDirectory)../browser-frame/browser-frame" Command="dotnet publish browser-frame.csproj -c $(Configuration) -p:WBTOverrideRuntimePack=true -p:TargetOS=browser -p:TargetArchitecture=wasm $(BuildAdditionalArgs)" />
 
     <ItemGroup>
-        <BrowserSourceFiles Include="$(MSBuildThisFileDirectory)../browser-frame/bin/$(Configuration)/$(NetCoreAppCurrent)/publish/wwwroot/**/*.*"/>
+        <BrowserSourceFiles Include="$(MSBuildThisFileDirectory)../browser-frame/browser-frame/bin/$(Configuration)/$(NetCoreAppCurrent)/publish/wwwroot/**/*.*"/>
     </ItemGroup>
 
     <Copy
diff --git a/src/mono/sample/wasm/browser-frame/Program.cs b/src/mono/sample/wasm/browser-frame/Program.cs
deleted file mode 100644
index a5999f79c54853..00000000000000
--- a/src/mono/sample/wasm/browser-frame/Program.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Runtime.InteropServices.JavaScript;
-
-BrowserBench.FrameApp.ReachedManaged();
-
-Console.WriteLine("Hello, Browser!");
-
-public partial class MyClass
-{
-    [JSExport]
-    internal static string Greeting()
-    {
-        var text = $"Hello, World! Greetings from {GetHRef()}";
-        Console.WriteLine(text);
-        return text;
-    }
-
-    [JSImport("window.location.href", "main.js")]
-    internal static partial string GetHRef();
-}
diff --git a/src/mono/sample/wasm/browser-frame/browser-frame.diff b/src/mono/sample/wasm/browser-frame/browser-frame.diff
new file mode 100644
index 00000000000000..72795bed439422
--- /dev/null
+++ b/src/mono/sample/wasm/browser-frame/browser-frame.diff
@@ -0,0 +1,23 @@
+diff -ru browser-frame/Program.cs browser-frame/Program.cs
+--- a/browser-frame/Program.cs	2024-03-07 09:00:37
++++ b/browser-frame/Program.cs	2024-03-05 15:38:42
+@@ -1,6 +1,8 @@
+ using System;
+ using System.Runtime.InteropServices.JavaScript;
+ 
++BrowserBench.FrameApp.ReachedManaged();
++
+ Console.WriteLine("Hello, Browser!");
+ 
+ public partial class MyClass
+diff -ru browser-frame/wwwroot/index.html browser-frame/wwwroot/index.html
+--- a/browser-frame/wwwroot/index.html	2024-03-07 09:00:37
++++ b/browser-frame/wwwroot/index.html	2024-03-05 15:38:42
+@@ -8,6 +8,7 @@
+   <meta charset="UTF-8">
+   <meta name="viewport" content="width=device-width, initial-scale=1.0">
+   <script type='module' src="./main.js"></script>
++  <script type="module" src="./frame.js"></script>
+ </head>
+ 
+ <body>
diff --git a/src/mono/sample/wasm/browser-frame/wwwroot/frame.js b/src/mono/sample/wasm/browser-frame/frame.js
similarity index 100%
rename from src/mono/sample/wasm/browser-frame/wwwroot/frame.js
rename to src/mono/sample/wasm/browser-frame/frame.js
diff --git a/src/mono/sample/wasm/browser-frame/runtimeconfig.template.json b/src/mono/sample/wasm/browser-frame/runtimeconfig.template.json
deleted file mode 100644
index b96a94320ba5ee..00000000000000
--- a/src/mono/sample/wasm/browser-frame/runtimeconfig.template.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "wasmHostProperties": {
-        "perHostConfig": [
-            {
-                "name": "browser",
-                "host": "browser"
-            }
-        ]
-    }
-}
\ No newline at end of file
diff --git a/src/mono/sample/wasm/browser-frame/wwwroot/index.html b/src/mono/sample/wasm/browser-frame/wwwroot/index.html
deleted file mode 100644
index 8b8df7572c2b5e..00000000000000
--- a/src/mono/sample/wasm/browser-frame/wwwroot/index.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<!--  Licensed to the .NET Foundation under one or more agreements. -->
-<!-- The .NET Foundation licenses this file to you under the MIT license. -->
-<html>
-
-<head>
-  <title>browser-frame</title>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <script type='module' src="./main.js"></script>
-  <script type="module" src="./frame.js"></script>
-</head>
-
-<body>
-  <span id="out"></span>
-</body>
-
-</html>
diff --git a/src/mono/sample/wasm/browser-frame/wwwroot/main.js b/src/mono/sample/wasm/browser-frame/wwwroot/main.js
deleted file mode 100644
index a073fc9cf70327..00000000000000
--- a/src/mono/sample/wasm/browser-frame/wwwroot/main.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-import { dotnet } from './_framework/dotnet.js'
-
-const { setModuleImports, getAssemblyExports, getConfig } = await dotnet
-    .withDiagnosticTracing(false)
-    .withApplicationArgumentsFromQuery()
-    .create();
-
-setModuleImports('main.js', {
-    window: {
-        location: {
-            href: () => globalThis.window.location.href
-        }
-    }
-});
-
-const config = getConfig();
-const exports = await getAssemblyExports(config.mainAssemblyName);
-const text = exports.MyClass.Greeting();
-console.log(text);
-
-document.getElementById('out').innerHTML = text;
-await dotnet.run();
\ No newline at end of file
diff --git a/src/mono/sample/wasm/browser-frame/wwwroot/start.html b/src/mono/sample/wasm/browser-frame/wwwroot/start.html
deleted file mode 100644
index 9dad19ec0a1cd1..00000000000000
--- a/src/mono/sample/wasm/browser-frame/wwwroot/start.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<!--  Licensed to the .NET Foundation under one or more agreements. -->
-<!-- The .NET Foundation licenses this file to you under the MIT license. -->
-<html>
-
-<head>
-  <title>browser-frame</title>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <script type='module' src="./start.js"></script>
-  <script type="module" src="./frame.js"></script>
-</head>
-
-<body>
-  <span id="out"></span>
-</body>
-
-</html>
diff --git a/src/mono/sample/wasm/browser-frame/wwwroot/start.js b/src/mono/sample/wasm/browser-frame/wwwroot/start.js
deleted file mode 100644
index a073fc9cf70327..00000000000000
--- a/src/mono/sample/wasm/browser-frame/wwwroot/start.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-import { dotnet } from './_framework/dotnet.js'
-
-const { setModuleImports, getAssemblyExports, getConfig } = await dotnet
-    .withDiagnosticTracing(false)
-    .withApplicationArgumentsFromQuery()
-    .create();
-
-setModuleImports('main.js', {
-    window: {
-        location: {
-            href: () => globalThis.window.location.href
-        }
-    }
-});
-
-const config = getConfig();
-const exports = await getAssemblyExports(config.mainAssemblyName);
-const text = exports.MyClass.Greeting();
-console.log(text);
-
-document.getElementById('out').innerHTML = text;
-await dotnet.run();
\ No newline at end of file