diff --git a/core/filetools.py b/core/filetools.py
index c3ffdcf6..b0482613 100644
--- a/core/filetools.py
+++ b/core/filetools.py
@@ -95,6 +95,9 @@ def encode(path, _samba=False):
         if fs_encoding and not PY3:
             path = path.encode(fs_encoding, "ignore")
 
+    if PY3 and isinstance(path, bytes):
+        path = path.decode(fs_encoding)
+
     return path