diff --git a/scripts/launchgame.js b/scripts/launchgame.js
index 11eda0de..ecc8afe1 100644
--- a/scripts/launchgame.js
+++ b/scripts/launchgame.js
@@ -49,6 +49,8 @@ function launchOSU(osu, beatmapid, version){
     }
 
     // switch page to game view
+    if (game.autofullscreen)
+        document.documentElement.requestFullscreen();
     let pGameArea = document.getElementById("game-area");
     var pMainPage = document.getElementById("main-page");
     var pNav = document.getElementById("main-nav");
diff --git a/scripts/settings.js b/scripts/settings.js
index 71c3767a..292c74ec 100644
--- a/scripts/settings.js
+++ b/scripts/settings.js
@@ -29,7 +29,7 @@ function setOptionPanel() {
 		K1name: 'Z',
 		K2name: 'X',
 		Kpausename: 'SPACE',
-		Kpause2name: 'ESCAPE',
+		Kpause2name: 'ESC',
 		K1keycode: 90,
 		K2keycode: 88,
 		Kpausekeycode: 32,
@@ -65,6 +65,7 @@ function setOptionPanel() {
 	        window.game.showhwmouse = this.showhwmouse;
 	        window.game.snakein = this.snakein;
 	        window.game.snakeout = this.snakeout;
+	        window.game.autofullscreen = this.autofullscreen;
 
 	        window.game.allowMouseScroll = !this.disableWheel;
 	        window.game.allowMouseButton = !this.disableButton;
@@ -207,6 +208,8 @@ function setOptionPanel() {
 				gamesettings[keynameitem] = e.key.toUpperCase();
 				if (gamesettings[keynameitem] == " ")
 					gamesettings[keynameitem] = "SPACE";
+				if (gamesettings[keynameitem] == "ESCAPE")
+					gamesettings[keynameitem] = "ESC";
 				btn.value = gamesettings[keynameitem];
 				gamesettings.loadToGame();
 		        saveToLocal();
@@ -232,6 +235,7 @@ function setOptionPanel() {
 	bindcheck("showhwmouse-check", "showhwmouse");
 	bindcheck("snakein-check", "snakein");
 	bindcheck("snakeout-check", "snakeout");
+	bindcheck("autofullscreen-check", "autofullscreen");
 
 	// input settings
 	bindcheck("disable-wheel-check", "disableWheel");
diff --git a/settings.html b/settings.html
index 6387a73c..e466cb12 100644
--- a/settings.html
+++ b/settings.html
@@ -105,6 +105,16 @@ <h3>
                             </div>
                         </td>
                     </tr>
+                    <tr>
+                        <td>
+                            <div class="option-name">
+                                进入游戏自动全屏
+                            </div>
+                            <div class="option-control">
+                                <input id="autofullscreen-check" type="checkbox" /><span></span>
+                            </div>
+                        </td>
+                    </tr>
 
                     <tr>
                         <td>