diff --git a/package.json b/package.json
index 3b6399cb..51e0144a 100644
--- a/package.json
+++ b/package.json
@@ -110,6 +110,7 @@
     "electron": "^10.2.0",
     "electron-builder": "^22.10.3",
     "electron-rebuild": "^2.3.4",
+    "mime-types": "^2.1.27",
     "node-abi": "2.19.3",
     "node-json-minify": "1.0.0",
     "terser": "^5.5.1"
diff --git a/src/classes/filesystem.class.js b/src/classes/filesystem.class.js
index dfbdf04b..a75b17c5 100644
--- a/src/classes/filesystem.class.js
+++ b/src/classes/filesystem.class.js
@@ -554,53 +554,13 @@ class FilesystemDisplay {
                 name = block.name;
             }
 
+            let mime = require("mime-types")
+
             block.path = block.path.replace(/\\/g, "/");
 
-            let filetype = name.split(".")[name.split(".").length - 1];
+            let filetype = mime.lookup(name.split(".")[name.split(".").length - 1]);
             switch (filetype) {
-                case "xml":
-                case "yaml":
-                case "java":
-                case "cs":
-                case "cpp":
-                case "h":
-                case "html":
-                case "css":
-                case "js":
-                case "md":
-                case "log":
-                case "bat":
-                case "sh":
-                case "gd":
-                //To anyone else working with this: Feel free to add on to this list. - Surge
-                case "txt":
-                case "json":
-                    fs.readFile(block.path, 'utf-8', (err, data) => {
-                        if (err) {
-                            new Modal({
-                                type: "info",
-                                title: "Failed to load file: " + block.path,
-                                html: err
-                            });
-                            console.log(err);
-                        };
-                        window.keyboard.detach();
-                        new Modal(
-                            {
-                                type: "custom",
-                                title: _escapeHtml(name),
-                                html: `<textarea id="fileEdit" rows="40" cols="150" spellcheck="false">${data}</textarea><p id="fedit-status"></p>`,
-                                buttons: [
-                                    {label:"Save to Disk",action:`window.writeFile('${block.path}')`}
-                                ]
-                            }, () => {
-                                window.keyboard.attach();
-                                window.term[window.currentTerm].term.focus();
-                            }
-                        );
-                    });
-                    break;
-                case "pdf":
+                case "application/pdf":
                     let html = `<div>
                         <div class="pdf_options">
                             <button class="zoom_in">
@@ -644,7 +604,33 @@ class FilesystemDisplay {
                     );
                     break;
                 default:
-                    return;
+                    if (mime.charset(filetype) === "UTF-8") {
+                        fs.readFile(block.path, 'utf-8', (err, data) => {
+                            if (err) {
+                                new Modal({
+                                    type: "info",
+                                    title: "Failed to load file: " + block.path,
+                                    html: err
+                                });
+                                console.log(err);
+                            };
+                            window.keyboard.detach();
+                            new Modal(
+                                {
+                                    type: "custom",
+                                    title: _escapeHtml(name),
+                                    html: `<textarea id="fileEdit" rows="40" cols="150" spellcheck="false">${data}</textarea><p id="fedit-status"></p>`,
+                                    buttons: [
+                                        {label:"Save to Disk",action:`window.writeFile('${block.path}')`}
+                                    ]
+                                }, () => {
+                                    window.keyboard.attach();
+                                    window.term[window.currentTerm].term.focus();
+                                }
+                            );
+                        });
+                   break;
+                }
             }
         }
 
@@ -753,4 +739,4 @@ class FilesystemDisplay {
 
 module.exports = {
     FilesystemDisplay
-};
\ No newline at end of file
+};
diff --git a/src/package-lock.json b/src/package-lock.json
index 0faab918..87bfc1de 100644
--- a/src/package-lock.json
+++ b/src/package-lock.json
@@ -351,6 +351,19 @@
         "p-is-promise": "^2.0.0"
       }
     },
+    "mime-db": {
+      "version": "1.44.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="
+    },
+    "mime-types": {
+      "version": "2.1.27",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+      "requires": {
+        "mime-db": "1.44.0"
+      }
+    },
     "mimic-fn": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
diff --git a/src/package.json b/src/package.json
index adcaea7e..6e7b62e8 100644
--- a/src/package.json
+++ b/src/package.json
@@ -28,8 +28,10 @@
     "geolite2-redist": "^2.0.1",
     "howler": "2.2.1",
     "maxmind": "4.3.1",
+    "mime-types": "^2.1.27",
     "nanoid": "3.1.20",
     "node-pty": "0.9.0",
+    "pdfjs-dist": "2.6.347",
     "pretty-bytes": "5.4.1",
     "shell-env": "3.0.0",
     "signale": "1.4.0",
@@ -42,8 +44,7 @@
     "xterm": "4.9.0",
     "xterm-addon-attach": "0.6.0",
     "xterm-addon-fit": "0.4.0",
-    "xterm-addon-ligatures": "0.3.0",
-    "pdfjs-dist": "2.6.347"
+    "xterm-addon-ligatures": "0.3.0"
   },
   "optionalDependencies": {
     "osx-temperature-sensor": "1.0.7"