diff --git a/src/main/java/it/polimi/ingsw/gc14/ClientLauncherGUI.java b/src/main/java/it/polimi/ingsw/gc14/ClientLauncherGUI.java
index 9757dc2..62aa8cd 100644
--- a/src/main/java/it/polimi/ingsw/gc14/ClientLauncherGUI.java
+++ b/src/main/java/it/polimi/ingsw/gc14/ClientLauncherGUI.java
@@ -8,8 +8,6 @@ import javafx.stage.Stage;
 public class ClientLauncherGUI {
 
     public static void main(String[] args) {
-        System.setProperty("glass.win.uiScale", "1.0");
-        System.setProperty("glass.gtk.uiScale", "1.0");
         Application.launch(GUIApp.class, args);
     }
 
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 482df6b..481cb53 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
@@ -13,7 +13,9 @@ import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.fxml.FXMLLoader;
+import javafx.geometry.Rectangle2D;
 import javafx.scene.Scene;
+import javafx.stage.Screen;
 import javafx.stage.Stage;
 import javafx.util.Duration;
 
@@ -105,10 +107,16 @@ public class GUI extends Application implements IView {
                     controllerLeaderboard.render();
                     primaryStage.setScene(leaderboardScene);
                 } else {
-                    double w = primaryStage.getWidth();
-                    double h = primaryStage.getHeight();
-                    primaryStage.setWidth(w);
-                    primaryStage.setHeight(h);
+                    //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();
                 }
diff --git a/src/main/java/it/polimi/ingsw/gc14/View/GUI/TotemFXMLController.java b/src/main/java/it/polimi/ingsw/gc14/View/GUI/TotemFXMLController.java
index ff98b03..c9bd7b9 100644
--- a/src/main/java/it/polimi/ingsw/gc14/View/GUI/TotemFXMLController.java
+++ b/src/main/java/it/polimi/ingsw/gc14/View/GUI/TotemFXMLController.java
@@ -36,9 +36,9 @@ public class TotemFXMLController {
     public void initialize() {
         Image img = new Image(getClass().getResourceAsStream("/GUIImages/Background.png"));
         backgroundImage.setImage(img);
-        //Rectangle2D screenBounds = Screen.getPrimary().getBounds();
-        //backgroundImage.setFitWidth(screenBounds.getWidth());
-        //backgroundImage.setFitHeight(screenBounds.getHeight());
+        Rectangle2D screenBounds = Screen.getPrimary().getBounds();
+        backgroundImage.setFitWidth(screenBounds.getWidth());
+        backgroundImage.setFitHeight(screenBounds.getHeight());
     }
 
     public void render() {