diff --git a/webroot/js/player.js b/webroot/js/player.js
index ea5e4a1..923f713 100644
--- a/webroot/js/player.js
+++ b/webroot/js/player.js
@@ -250,6 +250,8 @@ window.addEventListener('DOMContentLoaded', (event) => {
 	document.querySelector('.ytp-button-fullscreen-enter').addEventListener('click', () => toggleFullscreen());
 
 	if(localStorage.getItem("autoplay") == "true") {
+		toggleVideo(true);
+		document.querySelector('#autoplayInput').checked = true;
 		waiting = setInterval(()=> {
 			if(document.querySelector("video").readyState == 4) {
 				toggleVideo(true);
diff --git a/webroot/player.shs b/webroot/player.shs
index 6928e2e..d8bbdbf 100755
--- a/webroot/player.shs
+++ b/webroot/player.shs
@@ -27,6 +27,7 @@ echo '
 	<label for="audio">Audio stream:</label>
 	<input id="audioStreamInput" name="audio" type="text"><br>
 	<input type="checkbox" name="autoplay" id="autoplayInput" value="Autoplay">
+	<label for="autoplay">Autoplay?</label><br>
 	<button id="applyStreams">Apply</button><button id="resetStreams">Reset</button>
 </div>