diff --git a/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java b/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java
index b04543647e6d9245de341a1c8e8e453c40d1abe2..6fe1e4364c6e6099f0eea41ce2ad707ff09c8cb5 100644
--- a/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java
+++ b/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java
@@ -70,6 +70,10 @@ public class CreateJoinTournamentState extends State {
     private boolean includeCheckboxClicked = false;
     private boolean leaveConfirmed = false;
     private boolean joinButtonClicked = false;
+    private boolean enterButtonClicked = false;
+    private Tournament enteredTournament;
+    private Round enteredRound;
+
     private LoadingText loadingText = new LoadingText();
 
     public CreateJoinTournamentState(GameStateManager gsm) {
@@ -293,6 +297,14 @@ public class CreateJoinTournamentState extends State {
             this.joinButtonClicked = false;
         }
 
+        // User pressed the enter tournament button
+        if(this.enterButtonClicked && this.loadingText.textIsRendering()){
+            this.handleEnterBtnClick(this.enteredTournament, this.enteredRound);
+            this.enterButtonClicked = false;
+            this.enteredTournament = null;
+            this.enteredRound = null;
+        }
+
 
         this.loadingText.update(dt);
     }
@@ -319,6 +331,13 @@ public class CreateJoinTournamentState extends State {
         this.loadingText.setLoading();
     }
 
+    private void setEnterButtonClicked(Tournament clickedTournament, Round enteredRound){
+        this.enterButtonClicked = true;
+        this.enteredTournament = clickedTournament;
+        this.enteredRound = enteredRound;
+        this.loadingText.setLoading();
+    }
+
 
 //    Handle click methods
 
@@ -405,7 +424,7 @@ public class CreateJoinTournamentState extends State {
         }
 
         public void clicked(InputEvent event, float x, float y) {
-            handleEnterBtnClick(tournament, round);
+            setEnterButtonClicked(tournament, round);
         };
     }