diff --git a/src/components/File.vue b/src/components/File.vue
index 75710ca09..f90d2bad4 100644
--- a/src/components/File.vue
+++ b/src/components/File.vue
@@ -233,7 +233,9 @@ export default {
 	box-sizing: border-box;
 
 	// Selection border.
-	&.selected, &:focus-within {
+	&.selected,
+	&:focus-within,
+	&:has(:focus) {
 		&::after {
 			position: absolute;
 			top: 0;
@@ -246,6 +248,9 @@ export default {
 			outline-offset: -4px;
 			pointer-events: none;
 		}
+		.selection-checkbox {
+			opacity: 1;
+		}
 	}
 
 	.file {
diff --git a/src/components/FilesPicker.vue b/src/components/FilesPicker.vue
index d87c5542c..2bc6c3e66 100644
--- a/src/components/FilesPicker.vue
+++ b/src/components/FilesPicker.vue
@@ -44,7 +44,8 @@
 				:base-height="100"
 				:section-header-height="50"
 				:scroll-to-section="targetMonth"
-				@need-content="getFiles">
+				@need-content="getFiles"
+				@focusout.native="onFocusOut">
 				<template slot-scope="{file, height, isHeader, distance}">
 					<h3 v-if="isHeader"
 						:id="`photos-picker-section-header-${file.id}`"
@@ -183,6 +184,15 @@ export default {
 	},
 
 	methods: {
+		/**
+		 * @param {FocusEvent} event The focus event
+		 */
+		onFocusOut(event) {
+			if (event.relatedTarget === null) { // Focus escaping to body
+				event.target.focus({ preventScroll: true })
+			}
+		},
+
 		getFiles() {
 			this.fetchFiles('', {}, this.blacklistIds)
 		},