diff --git a/client/helpers/navigate.js b/client/helpers/navigate.js
index feb6df28..a520ff48 100644
--- a/client/helpers/navigate.js
+++ b/client/helpers/navigate.js
@@ -38,7 +38,7 @@ function encode_path(path){
 }
 
 export function prepare(path){
-    return encodeURIComponent(decodeURIComponent(path)); // to send our url correctly without using directly '/'
+    return encodeURIComponent(decodeURIComponent(path.replace(/%/g, '%25')));
 }
 
 export function urlParams() {
diff --git a/client/pages/filespage/thing-existing.js b/client/pages/filespage/thing-existing.js
index 5e3ab751..96888386 100644
--- a/client/pages/filespage/thing-existing.js
+++ b/client/pages/filespage/thing-existing.js
@@ -240,9 +240,11 @@ export class ExistingThing extends React.Component {
         }
         className = className.trim();
 
+        let encodedLink = encodeURIComponent(this.props.file.link).replace(/%2F/g, '/');
+
         return connectDragSource(connectDropNativeFile(connectDropFile(
             <div className={"component_thing view-"+this.props.view+(this.props.selected === true ? " selected" : " not-selected")}>
-              <ToggleableLink onClick={this.onThingClick.bind(this)} to={this.props.file.link + window.location.search} disabled={this.props.file.icon === "loading"}>
+              <ToggleableLink onClick={this.onThingClick.bind(this)} to={encodedLink + window.location.search} disabled={this.props.file.icon === "loading"}>
                 <Card ref="$card"className={this.state.hover} className={className}>
                   <Image preview={this.state.preview}
                          icon={this.props.file.icon || this.props.file.type}