diff --git a/internal/js/view_support.js b/internal/js/view_support.js
index 0f2df4d..b8eff74 100644
--- a/internal/js/view_support.js
+++ b/internal/js/view_support.js
@@ -63,6 +63,9 @@ function DrawImg()
     canvas.width=NewWidth(im)
     canvas.height=NewHeight(im)
 
+	// dont let caption be wider than image
+	$('#img-cap').width(canvas.width)
+
     // actually draw the pixel images to the canvas at the right size
     if( grayscale )
         context.filter='grayscale(1)'
@@ -77,7 +80,6 @@ function DrawImg()
     if( $('#fname_toggle').prop('checked' ) )
     {
         // reset fname for new image (if navigated left/right to get here)
-        $('#fname').html(PrettyFname(objs[current].url))
         $('.figcaption').show()
     }
     else
diff --git a/templates/viewer.html b/templates/viewer.html
index fb4f76d..759117a 100644
--- a/templates/viewer.html
+++ b/templates/viewer.html
@@ -176,8 +176,8 @@
                             window.addEventListener('resize', DrawImg, false);
                         </script>
                         <figcaption id="img-cap" class="figure-caption text-center text-wrap text-break"><span id="fname_i"></span></figcaption>
-                        <script>$('#fname_i').html(PrettyFname('{{objs[current].FullPathOnFS()}}'))</script>
                     </figure>
+                    <script>$('#fname_i').html(PrettyFname(objs[current].url))</script>
                     {% if objs[current].type.name != "Image" %}
                         <script>$('#figure').hide()</script>
                     {% endif %}
@@ -187,7 +187,7 @@
                             Your browser does not support the video tag.
                         </video>
                         <figcaption id="vid-cap" class="figure-caption text-center text-wrap text-break"><span id="fname_v"></span></figcaption>
-                        <script>$('#fname_v').html(PrettyFname('{{objs[current].FullPathOnFS()}}'))</script>
+						<script>$('#fname_v').html(PrettyFname(objs[current].url))</script>
                     </div>
                     <script>
                         window.addEventListener('resize', ResizeVideo, false);