diff --git a/src/components/Player.vue b/src/components/Player.vue
index 2a1063e1..61d4bb43 100644
--- a/src/components/Player.vue
+++ b/src/components/Player.vue
@@ -2,7 +2,8 @@
     <div class="uk-container-expand">
         <div
             data-shaka-player-container
-            style="width: 100%; height: 100%; max-height: 75vh; min-height: 250px; background: #000"
+            style="width: 100%; height: 100%; background: #000"
+            :style="!isEmbed ? { 'max-height': '75vh', 'min-height': '250px' } : {}"
             ref="container"
         >
             <video
@@ -42,6 +43,7 @@ export default {
         sponsors: Object,
         selectedAutoPlay: Boolean,
         selectedAutoLoop: Boolean,
+        isEmbed: Boolean,
     },
     data() {
         return {
diff --git a/src/components/WatchVideo.vue b/src/components/WatchVideo.vue
index 0a25232c..dc2bb20c 100644
--- a/src/components/WatchVideo.vue
+++ b/src/components/WatchVideo.vue
@@ -1,5 +1,16 @@
 <template>
-    <div class="uk-container uk-container-xlarge" v-if="video">
+    <div style="position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 999" v-if="video && isEmbed">
+        <Player
+            ref="videoPlayer"
+            :video="video"
+            :sponsors="sponsors"
+            :selectedAutoPlay="false"
+            :selectedAutoLoop="selectedAutoLoop"
+            :isEmbed="isEmbed"
+        />
+    </div>
+
+    <div class="uk-container uk-container-xlarge" v-if="video && !isEmbed">
         <ErrorHandler v-if="video && video.error" :message="video.message" :error="video.error" />
 
         <div v-show="!video.error">
@@ -128,7 +139,7 @@ export default {
             if (this.active) this.$refs.videoPlayer.loadVideo();
         });
         this.getSponsors();
-        if (this.getPreferenceBoolean("comments", true)) this.getComments();
+        if (!this.isEmbed && this.getPreferenceBoolean("comments", true)) this.getComments();
     },
     activated() {
         this.active = true;
@@ -181,7 +192,7 @@ export default {
                     if (!this.video.error) {
                         document.title = this.video.title + " - Piped";
                         this.channelId = this.video.uploaderUrl.split("/")[2];
-                        this.fetchSubscribedStatus();
+                        if (!this.isEmbed) this.fetchSubscribedStatus();
 
                         this.video.description = this.purifyHTML(
                             this.video.description
@@ -246,6 +257,11 @@ export default {
             return this.$route.query.v || this.$route.params.v;
         },
     },
+    computed: {
+        isEmbed(_this) {
+            return String(_this.$route.path).indexOf("/embed/") == 0;
+        },
+    },
     components: {
         Player,
         VideoItem,