diff --git a/frontend/src/components/EmbeddableVideoPlayer.tsx b/frontend/src/components/EmbeddableVideoPlayer.tsx
index 58c8592b..04a5793c 100644
--- a/frontend/src/components/EmbeddableVideoPlayer.tsx
+++ b/frontend/src/components/EmbeddableVideoPlayer.tsx
@@ -27,12 +27,14 @@ const EmbeddableVideoPlayer = ({ videoId }: EmbeddableVideoPlayerProps) => {
   const [, setSearchParams] = useSearchParams();
 
   const [refresh, setRefresh] = useState(false);
+  const [loading, setLoading] = useState(false);
 
   const [videoResponse, setVideoResponse] = useState<VideoResponseType>();
   const [playlists, setPlaylists] = useState<PlaylistList>();
 
   useEffect(() => {
     (async () => {
+      setLoading(true);
       const videoResponse = await loadVideoById(videoId);
 
       const playlistIds = videoResponse.data.playlist;
@@ -62,6 +64,7 @@ const EmbeddableVideoPlayer = ({ videoId }: EmbeddableVideoPlayerProps) => {
       setVideoResponse(videoResponse);
 
       setRefresh(false);
+      setLoading(false);
     })();
   }, [videoId, refresh]);
 
@@ -87,7 +90,14 @@ const EmbeddableVideoPlayer = ({ videoId }: EmbeddableVideoPlayerProps) => {
     <>
       <div className="player-wrapper">
         <div className="video-player">
-          <VideoPlayer video={videoResponse} sponsorBlock={sponsorblock} embed={true} />
+          {!loading && (
+            <VideoPlayer
+              video={videoResponse}
+              sponsorBlock={sponsorblock}
+              embed={true}
+              autoplay={true}
+            />
+          )}
 
           <div className="player-title boxed-content">
             <img
diff --git a/frontend/src/components/VideoListItem.tsx b/frontend/src/components/VideoListItem.tsx
index f6deb65d..379fa278 100644
--- a/frontend/src/components/VideoListItem.tsx
+++ b/frontend/src/components/VideoListItem.tsx
@@ -39,6 +39,8 @@ const VideoListItem = ({
       <a
         onClick={() => {
           setSearchParams({ videoId: video.youtube_id });
+
+          window.scroll({ top: 0, left: 0, behavior: 'smooth' });
         }}
       >
         <div className={`video-thumb-wrap ${viewLayout}`}>
diff --git a/frontend/src/pages/Home.tsx b/frontend/src/pages/Home.tsx
index 51a0c4c8..cf8c082d 100644
--- a/frontend/src/pages/Home.tsx
+++ b/frontend/src/pages/Home.tsx
@@ -171,6 +171,9 @@ const Home = () => {
     <>
       <title>TubeArchivist</title>
       <ScrollToTopOnNavigate />
+
+      {showEmbeddedVideo && <EmbeddableVideoPlayer videoId={videoId} />}
+
       <div className={`boxed-content ${gridView}`}>
         {continueVideos && continueVideos.length > 0 && (
           <>
@@ -212,8 +215,6 @@ const Home = () => {
         />
       </div>
 
-      {showEmbeddedVideo && <EmbeddableVideoPlayer videoId={videoId} />}
-
       <div className={`boxed-content ${gridView}`}>
         <div className={`video-list ${view} ${gridViewGrid}`}>
           {!hasVideos && (
diff --git a/frontend/src/style.css b/frontend/src/style.css
index 1621d5ec..781a518a 100644
--- a/frontend/src/style.css
+++ b/frontend/src/style.css
@@ -515,6 +515,7 @@ video:-webkit-full-screen {
 
 .video-thumb-wrap {
   position: relative;
+  cursor: pointer;
 }
 
 .video-thumb-wrap:hover > .video-play {