diff --git a/src/Objects/DirContent.php b/src/Objects/DirContent.php
index 3079713..1e1a83c 100644
--- a/src/Objects/DirContent.php
+++ b/src/Objects/DirContent.php
@@ -26,7 +26,7 @@ readonly class DirContent
             $fileInfo->getType() ?? 'N/A',
             $fileInfo->getPath(),
             $content,
-            mime_content_type($fileInfo->getFilename()),
+            mime_content_type($fileInfo->getPath() . '/' . $fileInfo->getFilename()),
         );
     }
 
diff --git a/templates/file.html.twig b/templates/file.html.twig
index 6ed481f..81be9b4 100644
--- a/templates/file.html.twig
+++ b/templates/file.html.twig
@@ -15,7 +15,11 @@
         </a>
 
         <div class="mt-6 text-gray-700 overflow-auto max-h-96">
-            <p class="whitespace-pre-wrap leading-relaxed break-all text-balance">{{ file.content|raw }}</p>
+            {% if file.mimeType starts with 'image' %}
+                <img src="{{ path('serve_file', {filePath: file.name}) }}" alt="">
+            {% else %}
+                <p class="whitespace-pre-wrap leading-relaxed break-all text-balance">{{ file.content|raw }}</p>
+            {% endif %}
         </div>
     </div>
 {% endblock %}
\ No newline at end of file