diff --git a/src/components/MediaLibrary/MediaLibrary.js b/src/components/MediaLibrary/MediaLibrary.js
index f13440e8e12a..12d5082e6d76 100644
--- a/src/components/MediaLibrary/MediaLibrary.js
+++ b/src/components/MediaLibrary/MediaLibrary.js
@@ -5,7 +5,7 @@ import c from 'classnames';
 import fuzzy from 'fuzzy';
 import Waypoint from 'react-waypoint';
 import Dialog from '../UI/Dialog';
-import { resolvePath } from '../../lib/pathHelper';
+import { resolvePath, fileExtension } from '../../lib/pathHelper';
 import { changeDraftField } from '../../actions/entries';
 import {
   loadMedia as loadMediaAction,
@@ -53,8 +53,11 @@ class MediaLibrary extends React.Component {
   /**
    * Filter an array of file data to include only images.
    */
-  filterImages = files => {
-    return files ? files.filter(file => IMAGE_EXTENSIONS.includes(last(file.name.split('.')))) : [];
+  filterImages = (files = []) => {
+    return files.filter(file => {
+      const ext = fileExtension(file.name);
+      return IMAGE_EXTENSIONS.includes(ext);
+    });
   };
 
   /**
@@ -62,7 +65,7 @@ class MediaLibrary extends React.Component {
    */
   toTableData = files => {
     const tableData = files && files.map(({ key, name, size, queryOrder, url, urlIsPublicPath }) => {
-      const ext = last(name.split('.'));
+      const ext = fileExtension(name);
       return {
         key,
         name,
diff --git a/src/lib/pathHelper.js b/src/lib/pathHelper.js
index 4748122eb336..04591ca3240b 100644
--- a/src/lib/pathHelper.js
+++ b/src/lib/pathHelper.js
@@ -77,7 +77,7 @@ export function fileExtensionWithSeparator(p) {
   if (i === -1 || i === 0) {
     return '';
   }
-  return p.substr(i);
+  return p.substr(i).toLowerCase();
 }
 
 /**