diff --git a/lib/filepicker.php b/lib/filepicker.php
index 5377058..7bcbaff 100644
--- a/lib/filepicker.php
+++ b/lib/filepicker.php
@@ -16,6 +16,13 @@ if (isset($VARS['path']) && file_exists($base . $VARS['path']) && strpos(realpat
     $folder = $VARS['path'];
 }
 
+// Compared to the start of the file mimetype, if it doesn't match the file is
+// skipped.  A type of "image" will match "image/png", "image/jpeg", etc.
+$type = [];
+if (isset($VARS['type']) && $VARS['type'] != "") {
+    $type = explode("|", $VARS['type']);
+}
+
 if ($folder == "/") {
     $folder = "";
 }
@@ -75,6 +82,21 @@ $fullpath = $base . $folder;
                 if (array_key_exists($extension, $EXT2MIME)) {
                     $mimetype = $EXT2MIME[$extension];
                 }
+
+                $found = true;
+                if (count($type) > 0) {
+                    $found = false;
+                    foreach ($type as $t) {
+                        if (strpos($mimetype, $t) === 0) {
+                            $found = true;
+                            break;
+                        }
+                    }
+                }
+                if (!$found) {
+                    continue;
+                }
+
                 // Lookup icon from mimetype
                 if (array_key_exists($mimetype, $MIMEICONS)) {
                     $icon = $MIMEICONS[$mimetype];
@@ -103,7 +125,7 @@ $fullpath = $base . $folder;
                 <i class="far fa-folder-open fa-5x fa-fw"></i>
             </p>
             <p class="h5 text-muted">
-                <?php lang("nothing here"); ?>
+    <?php lang("nothing here"); ?>
             </p>
         </div>
         <?php
diff --git a/static/js/editorparent.js b/static/js/editorparent.js
index c5b904c..d542f3e 100644
--- a/static/js/editorparent.js
+++ b/static/js/editorparent.js
@@ -78,14 +78,24 @@ function editComplex(json) {
     $("#editModal").modal();
 }
 
-function loadFilePickerFolder(path) {
+function loadFilePickerFolder(path, type) {
+    var ty = "";
+    switch (type) {
+        case "image":
+            ty = "image";
+            break;
+        case "media":
+            ty = "audio|video";
+            break;
+    }
     $.get("lib/filepicker.php", {
-        path: path
+        path: path,
+        type: ty
     }, function (data) {
         $("#fileBrowseModalBody").html(data);
         $(".filepicker-item").click(function () {
             if ($(this).data("type") == "dir") {
-                loadFilePickerFolder($(this).data("path"));
+                loadFilePickerFolder($(this).data("path"), type);
             } else {
                 var path = "file.php?file=" + $(this).data("path");
                 var data = {
@@ -101,7 +111,7 @@ function loadFilePickerFolder(path) {
 }
 
 function openFilePicker(type) {
-    loadFilePickerFolder("/");
+    loadFilePickerFolder("/", type);
     $("#fileBrowseModal").modal();
 }