diff --git a/src/components/EntryListing/EntryListing.js b/src/components/EntryListing/EntryListing.js
index 93cb15041472..faf5b2db1eed 100644
--- a/src/components/EntryListing/EntryListing.js
+++ b/src/components/EntryListing/EntryListing.js
@@ -41,6 +41,9 @@ export default class EntryListing extends React.Component {
     const title = label || entry.getIn(['data', inferedFields.titleField]);
     let image = entry.getIn(['data', inferedFields.imageField]);
     image = resolvePath(image, publicFolder);
+    if(image) {
+      image = encodeURI(image);
+    }
 
     return (
       <Card
diff --git a/src/lib/pathHelper.js b/src/lib/pathHelper.js
index 48d2a308b05e..4748122eb336 100644
--- a/src/lib/pathHelper.js
+++ b/src/lib/pathHelper.js
@@ -1,5 +1,5 @@
 const absolutePath = new RegExp('^(?:[a-z]+:)?//', 'i');
-const normalizePath = path => path.replace(/[\\\/]+/g, '/').replace(/[\s]+/g, '%20');
+const normalizePath = path => path.replace(/[\\\/]+/g, '/');
 
 export function resolvePath(path, basePath) { // eslint-disable-line
   // No path provided, skip