diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java
index f6cba848..29ee28ca 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java
@@ -9,7 +9,7 @@
 import pp.mdga.client.view.*;
 
 import javax.imageio.ImageIO;
-import java.awt.GraphicsEnvironment;
+import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
@@ -82,6 +82,12 @@ public static void main(String[] args) {
         settings.setSamples(128);
 
         if(prefs.getBoolean("fullscreen", false)) {
+            Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+            int screenWidth = (int) screenSize.getWidth();
+            int screenHeight = (int) screenSize.getHeight();
+
+            settings.setResolution(screenWidth, screenHeight);
+
             settings.setFullscreen(true);
         } else {
             settings.setWidth(prefs.getInt("width", 1280));
@@ -270,6 +276,10 @@ public void updateResolution(int width, int height, float imageFactor, boolean i
 
             float scaleFactor = Math.max((float) width / baseWidth, (float) height / baseHeight);
 
+            Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+            int screenWidth = (int) screenSize.getWidth();
+            int screenHeight = (int) screenSize.getHeight();
+            settings.setResolution(screenWidth, screenHeight);
             settings.setFullscreen(true);
 
             prefs.putFloat("scale", scaleFactor);