diff --git a/conduit/platform/FileGio.py b/conduit/platform/FileGio.py
index b6ab3f0..8524246 100644
--- a/conduit/platform/FileGio.py
+++ b/conduit/platform/FileGio.py
@@ -1,4 +1,5 @@
 import gio
+import urllib
 
 import conduit.platform
 
@@ -200,6 +201,8 @@ class FileImpl(conduit.platform.File):
         #if not relative, return abs path
         if not res:
             res = toURI
+        else:
+            res = urllib.quote(res)
         return res
 
     @staticmethod
@@ -353,10 +356,10 @@ class FolderScanner(conduit.platform.FolderScanner):
                     if filetype == gio.FILE_TYPE_DIRECTORY:
                         #Include hidden directories
                         if not hidden or self.includeHidden:
-                            self.dirs.append(dir+"/"+filename)
+                            self.dirs.append(dir+"/"+urllib.quote(filename))
                             t += 1
                     elif filetype == gio.FILE_TYPE_REGULAR or (filetype == gio.FILE_TYPE_SYMBOLIC_LINK and self.followSymlinks):
-                            uri = dir+"/"+filename
+                            uri = dir+"/"+urllib.quote(filename)
                             #Include hidden files
                             if not hidden or self.includeHidden:
                                 self.URIs.append(uri)
