diff --git a/files/templates/default.html b/files/templates/default.html
index 7d4dc7ce1b..084597dae8 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -496,9 +496,9 @@
 
 			var inlineVideo = document.getElementById("desktop-expanded-video");
 
-			inlineVideo.src = video.replace("100w.gif", "giphy.gif");
+			inlineVideo.src = video;
 			linkText.href = video;
-			videoLink.href=video;
+			videoLink.href = video;
 
 			linkText.textContent = 'View original';
 			};
@@ -1179,6 +1179,7 @@
 {% endif %}
 
 {% include "expanded_image_modal.html" %}
+{% include "expanded_video_modal.html" %}
 
 <script src="/assets/js/general13.js"></script>
 
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 48693c60fb..0be6de70c6 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -73,7 +73,7 @@
 						<img loading="lazy" src="{{p.thumb_url}}" class="post-img">
 					</a>
 				{% elif p.embed_url and "youtu" in p.domain %}
-					<a href="javascript:void(0)" class="expandable-video" data-toggle="modal" data-target="#expandVideoModal" data-url="{{p.realurl(v)}}" onclick="expandDesktopVideo('{{ p.realurl(v) }}')">
+					<a href="javascript:void(0)" class="expandable-video" data-toggle="modal" data-target="#expandVideoModal" data-url="{{p.realurl(v)}}" onclick="expandDesktopVideo('{{ p.embed_url }}')">
 						<img loading="lazy" src="{{p.thumb_url}}" class="post-img">
 					</a>
 				{% elif p.url and "streamable.com/e/" in p.url %}