diff --git a/src/Orchard.Web/Modules/Orchard.Media/Helpers/MediaHelpers.cs b/src/Orchard.Web/Modules/Orchard.Media/Helpers/MediaHelpers.cs
index d66cfab42..a4d486323 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Helpers/MediaHelpers.cs
+++ b/src/Orchard.Web/Modules/Orchard.Media/Helpers/MediaHelpers.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using System.Web.Mvc;
 using Orchard.Media.Models;
 
 namespace Orchard.Media.Helpers {
@@ -24,5 +26,10 @@ namespace Orchard.Media.Helpers {
 
             return navigations;
         }
+
+        public static bool IsPicture(this HtmlHelper htmlHelper, string path) {
+            return new[] {".png", ".jpg", ".jpeg", ".gif", ".bmp", ".ico"}
+                .Contains((Path.GetExtension(path) ?? "").ToLowerInvariant());
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.cshtml b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.cshtml
index 35bd46d31..76df9bf95 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.cshtml
@@ -5,8 +5,7 @@
 @{
     Style.Require("MediaAdmin");
     Layout.Title = T("Edit Media - {0}", Model.Name).ToString();
-    var isPicture = new[] {".png", ".jpg", ".jpeg", ".gif", ".bmp", ".ico"}
-        .Contains(Path.GetExtension(Model.RelativePath ?? "").ToLowerInvariant());
+    var isPicture = Html.IsPicture(Model.Name);
     var embedHTML = isPicture ?
         "<img src=\"" + Model.PublicUrl + "\"/>" :
         "<a href=\"" + Model.PublicUrl + "\">" + Model.Name + "</a>";