diff --git a/public/js/components.js b/public/js/components.js
index 49417fb7d..16b937f85 100644
Binary files a/public/js/components.js and b/public/js/components.js differ
diff --git a/public/js/status.js b/public/js/status.js
index 9888503cc..acebb75bb 100644
Binary files a/public/js/status.js and b/public/js/status.js differ
diff --git a/public/js/timeline.js b/public/js/timeline.js
index dbd628b49..db57a0e3c 100644
Binary files a/public/js/timeline.js and b/public/js/timeline.js differ
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 0de220640..e66bc6a21 100644
Binary files a/public/mix-manifest.json and b/public/mix-manifest.json differ
diff --git a/resources/assets/js/components/PostComponent.vue b/resources/assets/js/components/PostComponent.vue
index 5799377a8..5e2d35fe3 100644
--- a/resources/assets/js/components/PostComponent.vue
+++ b/resources/assets/js/components/PostComponent.vue
@@ -63,7 +63,7 @@
               </div>
 
               <div v-else-if="status.pf_type === 'photo:album'" class="w-100">
-                <photo-album-presenter :status="status"></photo-album-presenter>
+                <photo-album-presenter :status="status" v-on:lightbox="lightbox"></photo-album-presenter>
               </div>
 
               <div v-else-if="status.pf_type === 'video:album'" class="w-100">
@@ -71,7 +71,7 @@
               </div>
 
               <div v-else-if="status.pf_type === 'photo:video:album'" class="w-100">
-                <mixed-album-presenter :status="status"></mixed-album-presenter>
+                <mixed-album-presenter :status="status" v-on:lightbox="lightbox"></mixed-album-presenter>
               </div>
 
               <div v-else class="w-100">
diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue
index 0d766bea1..ce35e88db 100644
--- a/resources/assets/js/components/Timeline.vue
+++ b/resources/assets/js/components/Timeline.vue
@@ -66,7 +66,7 @@
 					</div>
 
 					<div v-else-if="status.pf_type === 'photo:album'" class="w-100">
-						<photo-album-presenter :status="status"></photo-album-presenter>
+						<photo-album-presenter :status="status" v-on:lightbox="lightbox"></photo-album-presenter>
 					</div>
 
 					<div v-else-if="status.pf_type === 'video:album'" class="w-100">
@@ -74,7 +74,7 @@
 					</div>
 
 					<div v-else-if="status.pf_type === 'photo:video:album'" class="w-100">
-						<mixed-album-presenter :status="status"></mixed-album-presenter>
+						<mixed-album-presenter :status="status" v-on:lightbox="lightbox"></mixed-album-presenter>
 					</div>
 
 					<div v-else class="w-100">
diff --git a/resources/assets/js/components/presenter/MixedAlbumPresenter.vue b/resources/assets/js/components/presenter/MixedAlbumPresenter.vue
index f2d284b02..417d89a51 100644
--- a/resources/assets/js/components/presenter/MixedAlbumPresenter.vue
+++ b/resources/assets/js/components/presenter/MixedAlbumPresenter.vue
@@ -18,7 +18,7 @@
 						<source :src="media.url" :type="media.mime">
 					</video>
 
-					<div v-else-if="media.type == 'Image'" slot="img" :class="media.filter_class">
+					<div v-else-if="media.type == 'Image'" slot="img" :class="media.filter_class" v-on:click="$emit('lightbox', media)">
 						<img class="d-block img-fluid w-100" :src="media.url" :alt="media.description" :title="media.description">
 					</div>
 
@@ -42,7 +42,7 @@
 					<source :src="media.url" :type="media.mime">
 				</video>
 
-				<div v-else-if="media.type == 'Image'" slot="img" :class="media.filter_class">
+				<div v-else-if="media.type == 'Image'" slot="img" :class="media.filter_class" v-on:click="$emit('lightbox', media)">
 					<img class="d-block img-fluid w-100" :src="media.url" :alt="media.description" :title="media.description">
 				</div>
 
diff --git a/resources/assets/js/components/presenter/PhotoAlbumPresenter.vue b/resources/assets/js/components/presenter/PhotoAlbumPresenter.vue
index b121d6b10..231968e19 100644
--- a/resources/assets/js/components/presenter/PhotoAlbumPresenter.vue
+++ b/resources/assets/js/components/presenter/PhotoAlbumPresenter.vue
@@ -13,7 +13,7 @@
 				:interval="0"
 			>
 				<b-carousel-slide v-for="(img, index) in status.media_attachments" :key="img.id">
-					<div slot="img" :class="img.filter_class + ' d-block mx-auto text-center'" style="max-height: 600px;">
+					<div slot="img" :class="img.filter_class + ' d-block mx-auto text-center'" style="max-height: 600px;" v-on:click="$emit('lightbox', img)">
 						<img class="img-fluid" style="max-height: 600px;" :src="img.url" :alt="img.description" :title="img.description">
 					</div>
 				</b-carousel-slide>
@@ -32,7 +32,7 @@
 			:interval="0"
 		>
 			<b-carousel-slide v-for="(img, index) in status.media_attachments" :key="img.id">
-				<div slot="img" :class="img.filter_class + ' d-block mx-auto text-center'" style="max-height: 600px;">
+				<div slot="img" :class="img.filter_class + ' d-block mx-auto text-center'" style="max-height: 600px;" v-on:click="$emit('lightbox', img)">
 					<img class="img-fluid" style="max-height: 600px;" :src="img.url" :alt="img.description" :title="img.description">
 				</div>
 			</b-carousel-slide>
diff --git a/resources/assets/js/components/presenter/PhotoPresenter.vue b/resources/assets/js/components/presenter/PhotoPresenter.vue
index 20539a475..8be1a1458 100644
--- a/resources/assets/js/components/presenter/PhotoPresenter.vue
+++ b/resources/assets/js/components/presenter/PhotoPresenter.vue
@@ -5,13 +5,13 @@
 				<p class="mb-0 lead font-weight-bold">{{ status.spoiler_text ? status.spoiler_text : 'CW / NSFW / Hidden Media'}}</p>
 				<p class="font-weight-light">(click to show)</p>
 			</summary>
-			<a class="max-hide-overflow" :href="status.url" :class="status.media_attachments[0].filter_class">
+			<div class="max-hide-overflow" v-on:click="$emit('lightbox', status.media_attachments[0])" :class="status.media_attachments[0].filter_class">
 				<img class="card-img-top" :src="status.media_attachments[0].url" :alt="status.media_attachments[0].description" :title="status.media_attachments[0].description">
-			</a>
+			</div>
 		</details>
 	</div>
 	<div v-else>
-		<div :class="status.media_attachments[0].filter_class" v-on:click="showLightbox(status.media_attachments[0])">
+		<div :class="status.media_attachments[0].filter_class" v-on:click="$emit('lightbox', status.media_attachments[0])">
 			<img class="card-img-top" :src="status.media_attachments[0].url" :alt="status.media_attachments[0].description" :title="status.media_attachments[0].description">
 		</div>
 	</div>
@@ -19,12 +19,6 @@
 
 <script type="text/javascript">
 	export default {
-		props: ['status'],
-
-		methods: {
-			showLightbox(src) {
-				this.$emit('lightbox', src);
-			}
-		}
+		props: ['status']
 	}
 </script>
\ No newline at end of file