diff --git a/src/_renderer.js b/src/_renderer.js
index b11a5bb90345cf890bb4af67305a40d25862b0dc..35bdd85f94ff957c7c721c4166a359bd7938fcbe 100644
--- a/src/_renderer.js
+++ b/src/_renderer.js
@@ -13,6 +13,9 @@ window._escapeHtml = text => {
     };
     return text.replace(/[&<>"']/g, m => {return map[m];});
 };
+window._encodePathURI = uri => {
+    return encodeURI(uri).replace(/#/g, "%23");
+};
 window._purifyCSS = str => {
     if (typeof str === "undefined") return "";
     if (typeof str !== "string") {
diff --git a/src/classes/filesystem.class.js b/src/classes/filesystem.class.js
index c0aae5b05e37f1f09f6ad08cbb2079b18ee78406..f7c42215f38e2c71b4eabd4d305b0f67ea1b89a7 100644
--- a/src/classes/filesystem.class.js
+++ b/src/classes/filesystem.class.js
@@ -548,11 +548,11 @@ class FilesystemDisplay {
 
             switch(type || block.type) {
                 case "image":
-                    html = `<img class="fsDisp_mediaDisp" src="${path || block.path}" ondragstart="return false;">`;
+                    html = `<img class="fsDisp_mediaDisp" src="${window._encodePathURI(path || block.path)}" ondragstart="return false;">`;
                     break;
                 case "video":
                     html = `<video class="fsDisp_mediaDisp" controls preload="auto">
-                            <source src="${path || block.path}">
+                            <source src="${window._encodePathURI(path || block.path)}">
                             Unsupported video format!
                         </video>`;
                     break;