diff --git a/packages/client/src/components/MkMediaList.vue b/packages/client/src/components/MkMediaList.vue
index 6ee427388..237afc675 100644
--- a/packages/client/src/components/MkMediaList.vue
+++ b/packages/client/src/components/MkMediaList.vue
@@ -166,6 +166,8 @@ onMounted(() => {
 	lightbox.on("afterInit", () => {
 		history.pushState(null, "", location.href);
 		addEventListener("popstate", close);
+		// This is a workaround. Not sure why, but when clicking to open, it doesn't move focus to the photoswipe. Preventing using esc to close. However when using keyboard to open it already focuses the lightbox fine.
+		lightbox.pswp.element.focus();
 	})
 	lightbox.on("close", () => {
 		removeEventListener("popstate", close);