diff --git a/frontend/src/components/ToggleConfig.tsx b/frontend/src/components/ToggleConfig.tsx
index 61b301cc..4238ec33 100644
--- a/frontend/src/components/ToggleConfig.tsx
+++ b/frontend/src/components/ToggleConfig.tsx
@@ -24,17 +24,20 @@ const ToggleConfig = ({
             updateCallback(name, event.target.checked);
           }}
         />
+
         {!value && (
           <label htmlFor="" className="ofbtn">
             Off
           </label>
         )}
+
         {value && (
           <label htmlFor="" className="onbtn">
             On
           </label>
         )}
       </div>
+
       {resetCallback !== undefined && <button onClick={() => resetCallback(false)}>Reset</button>}
     </div>
   );
diff --git a/frontend/src/pages/Video.tsx b/frontend/src/pages/Video.tsx
index 62c86bd5..9485ce13 100644
--- a/frontend/src/pages/Video.tsx
+++ b/frontend/src/pages/Video.tsx
@@ -38,6 +38,7 @@ import Button from '../components/Button';
 import getApiUrl from '../configuration/getApiUrl';
 import loadVideoNav, { VideoNavResponseType } from '../api/loader/loadVideoNav';
 import useIsAdmin from '../functions/useIsAdmin';
+import ToggleConfig from '../components/ToggleConfig';
 
 const isInPlaylist = (videoId: string, playlist: PlaylistType) => {
   return playlist.playlist_entries.some(entry => {
@@ -484,32 +485,25 @@ const Video = () => {
                     </h3>
                   </Link>
 
-                  <div className="toggle">
-                    <p>Autoplay:</p>
-                    <div className="toggleBox">
-                      <input
-                        checked={playlistAutoplay}
-                        onChange={() => {
-                          if (!playlistAutoplay) {
-                            setPlaylistIDForAutoplay(playlistItem.playlist_meta.playlist_id);
-                          }
+                  <p>Autoplay:</p>
+                  <ToggleConfig
+                    name="Autoplay:"
+                    value={
+                      playlistAutoplay &&
+                      playlistIdForAutoplay === playlistItem.playlist_meta.playlist_id
+                    }
+                    updateCallback={(_, checked) => {
+                      if (checked) {
+                        setPlaylistIDForAutoplay(playlistItem.playlist_meta.playlist_id);
+                        setPlaylistAutoplay(true);
 
-                          setPlaylistAutoplay(!playlistAutoplay);
-                        }}
-                        type="checkbox"
-                      />
-                      {!playlistAutoplay && (
-                        <label htmlFor="" className="ofbtn">
-                          Off
-                        </label>
-                      )}
-                      {playlistAutoplay && (
-                        <label htmlFor="" className="onbtn">
-                          On
-                        </label>
-                      )}
-                    </div>
-                  </div>
+                        return;
+                      }
+
+                      setPlaylistIDForAutoplay('');
+                      setPlaylistAutoplay(false);
+                    }}
+                  />
 
                   <div className="playlist-nav">
                     <div className="playlist-nav-item">