diff --git a/frontend/static/js/views/HomeView.js b/frontend/static/js/views/HomeView.js
index b698f79..aa153d4 100644
--- a/frontend/static/js/views/HomeView.js
+++ b/frontend/static/js/views/HomeView.js
@@ -12,7 +12,6 @@ export default class extends AbstractAuthenticatedView {
 			<h1>${lang.get('homeTitle', 'Home')}</h1>
             <a href="/matchmaking" data-link>${lang.get('homeOnline', 'Play online')}</a>
             <a href="/games/offline" data-link>${lang.get('homeOffline', 'Play offline')}</a>
-			<a href="/tictactoeonline" data-link>${lang.get('ticTacToeOnline')}</a>
 			<a href="/tictactoe" data-link>${lang.get('ticTacToe')}</a>
             <a href="/settings" data-link>${lang.get('homeSettings', 'Settings')}</a>
             <a href="/logout" data-link>${lang.get('homeLogout', 'Logout')}</a>
diff --git a/frontend/static/js/views/MatchMakingView.js b/frontend/static/js/views/MatchMakingView.js
index 35d6f0b..6741583 100644
--- a/frontend/static/js/views/MatchMakingView.js
+++ b/frontend/static/js/views/MatchMakingView.js
@@ -53,6 +53,9 @@ export default class extends AbstractAuthenticatedView {
         this.button = document.getElementById("toggle-search");
         this.input = document.getElementById("nb-players-input");
         
+        let container = document.getElementById("nb-players-container");
+        let gameChoice = document.getElementById("game-choice");
+
         this.button.onclick = this.toggle_search.bind(this);
 
         this.input.addEventListener('keydown', async ev => {
@@ -63,6 +66,17 @@ export default class extends AbstractAuthenticatedView {
             await this.toggle_search.bind(this);
         });
 
+        gameChoice.addEventListener("change", function()
+        {
+            if (this.value === "TicTacToe")
+            {
+                container.style.display = 'none';
+                document.getElementById("nb-players-input").value = 2;
+            }
+            else
+                container.style.display = 'block';
+        })
+
         let update = () => {
             this.button.disabled = (this.input.value < 2 || this.input.value > 4);
         };
@@ -74,10 +88,18 @@ export default class extends AbstractAuthenticatedView {
 
     async getHtml() {
         return /* HTML */ `
-            <div class='container-fluid'>
-                <div class='border border-2 rounded bg-light-subtle mx-auto p-2 col-md-7 col-lg-4'>
-                    <h4 class='text-center fw-semibold mb-4' id="title">${lang.get("matchmakingTitle")}</h4>
+        <div class='container-fluid'>
+            <div class='border border-2 rounded bg-light-subtle mx-auto p-2 col-md-7 col-lg-4'>
+                <h4 class='text-center fw-semibold mb-4' id="title">${lang.get("matchmakingTitle")}</h4>
+                <div>
                     <div class='form-floating mb-2'>
+                        <select class='form-control' id='game-choice'>
+                            <option value='Pong'>Pong</option>
+                            <option value='TicTacToe'>TicTacToe</option>
+                        </select>
+                        <label for='game-choice'>${lang.get("gamemodeChoice")}</label>
+                    </div>
+                    <div class='form-floating mb-2' id='nb-players-container'>
                         <input type='number' min='2' value='2' max='4' class='form-control' id='nb-players-input' placeholder='${lang.get("matchmakingNbPlayers")}'>
                         <label for='nb-players-input' id='username-label'>${lang.get("matchmakingNbPlayers")}</label>
                         <span class='text-danger' id='username'></span>
@@ -88,6 +110,7 @@ export default class extends AbstractAuthenticatedView {
                     </div>
                 </div>
             </div>
+        </div>
         `;
     }