diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 3b00b61..ba07347 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Publish the website in its release form
         run: |
           dotnet workload install wasm-tools
-          dotnet publish --configuration Release
+          dotnet publish --configuration Release -p:GHPAGES=1
 
       - name: Change base-tag
         run: sed -i 's/<base href="\/" \/>/<base href="\/Demos\/" \/>/g' $PUBLISH_FOLDER/index.html
diff --git a/Demos/Pages/Index.razor b/Demos/Pages/Index.razor
index 7e9b3c8..e44802e 100644
--- a/Demos/Pages/Index.razor
+++ b/Demos/Pages/Index.razor
@@ -36,7 +36,7 @@
 				Dictionary API. This is based on Nettify.
             </td>
             <td>
-                <button class="btn btn-primary" @onclick="@(e => NavManager.NavigateTo("/define"))">
+                <button class="btn btn-primary" @onclick="@(e => NavManager.NavigateTo(usesGhPages ? "/Demos" : "" + "/define"))">
 					<span class="oi oi-media-play" aria-hidden="true" />
 			    </button>
             </td>
@@ -50,7 +50,7 @@
 				list of all the English-pronounced names. This is based on Textify and our words list.
             </td>
             <td>
-                <button class="btn btn-primary" @onclick="@(e => NavManager.NavigateTo("/namefind"))">
+				<button class="btn btn-primary" @onclick="@(e => NavManager.NavigateTo(usesGhPages ? "/Demos" : "" + "/namefind"))">
 					<span class="oi oi-media-play" aria-hidden="true" />
 			    </button>
             </td>
@@ -64,10 +64,20 @@
 				list of all the English-pronounced names. This is based on Textify and our words list.
             </td>
             <td>
-                <button class="btn btn-primary" @onclick="@(e => NavManager.NavigateTo("/namegen"))">
+				<button class="btn btn-primary" @onclick="@(e => NavManager.NavigateTo(usesGhPages ? "/Demos" : "" + "/namegen"))">
 					<span class="oi oi-media-play" aria-hidden="true" />
 			    </button>
             </td>
         </tr>
     </tbody>
 </table>
+
+@code {
+	bool usesGhPages =
+		#if GHPAGES
+			true
+		#else
+			false
+		#endif
+		;
+}