diff --git a/files/templates/default.html b/files/templates/default.html
index 084597dae..3b1377480 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -1180,6 +1180,7 @@
 
 {% include "expanded_image_modal.html" %}
 {% include "expanded_video_modal.html" %}
+{% include "expanded_video_modal2.html" %}
 
 <script src="/assets/js/general13.js"></script>
 
diff --git a/files/templates/expanded_video_modal2.html b/files/templates/expanded_video_modal2.html
new file mode 100644
index 000000000..c5188481d
--- /dev/null
+++ b/files/templates/expanded_video_modal2.html
@@ -0,0 +1,22 @@
+<!-- Expand Desktop Video Modal -->
+
+<div class="modal desktop-expanded-video-modal" id="expandVideoModal" tabindex="-1" role="dialog" aria-labelledby="expandVideoModalTitle" aria-hidden="true">
+	<div class="modal-dialog modal-xl modal-dialog-centered mx-auto" role="document" style="width: fit-content;">
+		<div class="modal-content bg-transparent shadow-none m-5 m-md-0">
+
+			<div class="modal-body text-center p-0">
+				<div class="d-inline-block position-relative">
+					<a href="" rel="nofollow noopener noreferrer" target="_blank" id="desktop-expanded-video-wrap-link">
+						<video controls="" preload="none" style="max-width: 100%">
+							<source src="" id="desktop-expanded-video" type="video/mp4">
+						</video>
+					</a>
+					<div class="position-absolute d-flex justify-content-between align-items-center w-100 mt-1">
+						<a href="" rel="nofollow noopener noreferrer" target="_blank" class="text-gray-500 font-weight-bold text-left" id="desktop-expanded-video-link">View original</a>
+					</div>
+				</div>
+			</div>
+			
+		</div>
+	</div>
+</div>
diff --git a/files/templates/formatting.html b/files/templates/formatting.html
index f72b95ef7..ea594f485 100644
--- a/files/templates/formatting.html
+++ b/files/templates/formatting.html
@@ -144,6 +144,7 @@ We also have some custom hooks for mentioning users and subreddits. Note that th
 
 {% include "expanded_image_modal.html" %}
 {% include "expanded_video_modal.html" %}
+{% include "expanded_video_modal2.html" %}
 
 <script src="/assets/js/general13.js"></script>
 
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 29d8030d4..3f35dcc4e 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -80,7 +80,11 @@
 					<a href="javascript:void(0)" class="expandable-video" data-toggle="modal" data-target="#expandVideoModal" data-url="{{p.realurl(v)}}" onclick="expandDesktopVideo('{{ p.realurl(v) }}')">
 						<img loading="lazy" src="{{p.thumb_url}}" class="post-img">
 					</a>
-				{% elif not p.is_video %}
+				{% elif p.is_video %}
+					<a href="javascript:void(0)" class="expandable-video" data-toggle="modal" data-target="#expandVideoModal2" data-url="{{p.realurl(v)}}" onclick="expandDesktopVideo('{{ p.realurl(v) }}')">
+						<img loading="lazy" src="{{p.thumb_url}}" class="post-img">
+					</a>
+				{% else %}
 					<a {% if not v or v.newtabexternal %}target="_blank"{% endif %} rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}">
 						<img loading="lazy" src="{{p.thumb_url}}" class="post-img">
 					</a>