diff --git a/src/main/java/it/polimi/ingsw/gc14/View/GUI/GUI.java b/src/main/java/it/polimi/ingsw/gc14/View/GUI/GUI.java
index 481cb53..a3bb8df 100644
--- a/src/main/java/it/polimi/ingsw/gc14/View/GUI/GUI.java
+++ b/src/main/java/it/polimi/ingsw/gc14/View/GUI/GUI.java
@@ -78,7 +78,14 @@ public class GUI extends Application implements IView {
 
 
         primaryStage.setScene(loginScene);
-        primaryStage.setMaximized(true);
+        primaryStage.setFullScreen(true);
+        Rectangle2D tmp = Screen.getPrimary().getVisualBounds();
+        primaryStage.setWidth(tmp.getWidth());
+        primaryStage.setHeight(tmp.getHeight());
+        primaryStage.setX(tmp.getMinX());
+        primaryStage.setY(tmp.getMinY());
+        primaryStage.setResizable(false);
+
         primaryStage.setTitle("Mesos");
         primaryStage.setOnCloseRequest(e -> {
             Platform.exit();
@@ -99,27 +106,34 @@ public class GUI extends Application implements IView {
 
     public void render() {
         Platform.runLater(() -> {
+            boolean toFull=false;
+
             synchronized (miniModel) {
                 if (controller.miniModel.currentState.getGameStage() == TOTEM_CHOICE) {
+                    if (primaryStage.getScene()!=leaderboardScene) {
+                        toFull=true;
+                    }
                     controllerTotem.render();
                     primaryStage.setScene(totemScene);
                 } else if (controller.miniModel.currentState.getGameStage() == ENDED) {
+                    if (primaryStage.getScene()!=leaderboardScene) {
+                        toFull=true;
+                    }
                     controllerLeaderboard.render();
                     primaryStage.setScene(leaderboardScene);
                 } else {
+                    if (primaryStage.getScene()!=mainScene) {
+                        toFull=true;
+                    }
                     //double w = primaryStage.getWidth();
                     //double h = primaryStage.getHeight();
-                    //primaryStage.setMaximized(true);
-                    primaryStage.setFullScreen(true);
-                    Rectangle2D tmp = Screen.getPrimary().getVisualBounds();
-                    primaryStage.setWidth(tmp.getWidth());
-                    primaryStage.setHeight(tmp.getHeight());
-                    primaryStage.setX(tmp.getMinX());
-                    primaryStage.setY(tmp.getMinY());
-                    primaryStage.setResizable(false);
                     primaryStage.setScene(mainScene);
                     controllerMain.render();
                 }
+
+                if (toFull) {
+                    primaryStage.setFullScreen(true);
+                }
             }
         });