diff --git a/web/static/css/theme.css b/web/static/css/theme.css
index 33b6a2a..17678ad 100644
--- a/web/static/css/theme.css
+++ b/web/static/css/theme.css
@@ -8,6 +8,16 @@ abbr {
     cursor: not-allowed;
 }
 
+img {
+    /* https://stackoverflow.com/questions/12906789/preventing-an-image-from-being-draggable-or-selectable-without-using-js */
+    user-drag: none;
+    user-select: none;
+    -moz-user-select: none;
+    -webkit-user-drag: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+}
+
 /* Container for large profile pic on user pages */
 .profile-photo {
     width: 150px;
diff --git a/web/templates/photo/gallery.html b/web/templates/photo/gallery.html
index 42df558..4e6435a 100644
--- a/web/templates/photo/gallery.html
+++ b/web/templates/photo/gallery.html
@@ -572,7 +572,7 @@
                                     <source src="{{PhotoURL .Filename}}" type="video/mp4">
                                 </video>
                                 {{else}}
-                                <a href="{{PhotoURL .Filename}}" target="_blank"
+                                <a href="/photo/view?id={{.ID}}" target="_blank"
                                     class="js-modal-trigger" data-target="detail-modal"
                                     onclick="setModalImage(this.href)">
                                     <img src="{{PhotoURL .Filename}}" loading="lazy"{{if BlurExplicit .}} class="blurred-explicit"{{end}}>