diff --git a/src/js/filemanager.js b/src/js/filemanager.js
index d82bcf0c7..8495682e5 100644
--- a/src/js/filemanager.js
+++ b/src/js/filemanager.js
@@ -116,7 +116,10 @@ app.controller('FileManagerController', ['$scope', '$translate', '$timeout', 'Cl
             else if (v === '..') a.pop();
             else a.push(v);
             return a;
-        }, []).join('/');
+        }, []).map(function (p) {
+            // small detour to safely handle special characters and whitespace
+            return encodeURIComponent(decodeURIComponent(p));
+        }).join('/');
 
         return filePath;
     }