diff --git a/client/components/breadcrumb.js b/client/components/breadcrumb.js
index 893b81f1..28b9c65a 100644
--- a/client/components/breadcrumb.js
+++ b/client/components/breadcrumb.js
@@ -136,7 +136,7 @@ export class PathElementWrapper extends React.Component {
         return (
             <li className={className}>
               <NgIf cond={this.props.isLast === false}>
-                <Link to={"/files" + (this.props.path.full || "/") + location.search} className="label">
+                <Link to={"/files" + ((this.props.path.full || "").replace(/#/g, "%23") || "/") + location.search} className="label">
                   <NgIf cond={this.props.path.minify !== true}>
                     {this.limitSize(this.props.path.label)}
                   </NgIf>
diff --git a/client/pages/filespage.js b/client/pages/filespage.js
index 5cd042d4..41302c21 100644
--- a/client/pages/filespage.js
+++ b/client/pages/filespage.js
@@ -32,7 +32,7 @@ export class FilesPage extends React.Component {
             this.props.history.push(props.match.url + "/");
         }
         this.state = {
-            path: props.match.url.replace('/files', '') || '/',
+            path: props.match.url.replace('/files', '').replace(/%23/g, "#") || '/',
             sort: settings_get('filespage_sort') || 'type',
             sort_reverse: true,
             show_hidden: settings_get('filespage_show_hidden') || CONFIG["display_hidden"],
@@ -88,7 +88,7 @@ export class FilesPage extends React.Component {
             if(/\/$/.test(path) === false){ path = path + "/"; }
             if(/^\//.test(path) === false){ path = "/"+ path; }
             return path;
-        }(nextProps.match.params.path);
+        }(nextProps.match.params.path.replace(/%23/g, "#"));
         if(new_path !== this.state.path){
             this.setState({path: new_path, loading: true});
             this.onRefresh(new_path);
@@ -117,6 +117,7 @@ export class FilesPage extends React.Component {
                 let files = new Array(res.results.length);
                 for(let i=0,l=res.results.length; i<l; i++){
                     let path = this.state.path+res.results[i].name;
+                    path = path.replace(/#/g, "%23");
                     if(this.state.show_hidden === false && res.results[i].name[0] === "."){
                         continue;
                     }
diff --git a/client/pages/viewerpage.js b/client/pages/viewerpage.js
index 6b669e46..74aab51e 100644
--- a/client/pages/viewerpage.js
+++ b/client/pages/viewerpage.js
@@ -31,7 +31,7 @@ export class ViewerPage extends React.Component {
     constructor(props){
         super(props);
         this.state = {
-            path: props.match.url.replace('/view', '') + (location.hash || ""),
+            path: props.match.url.replace('/view', '').replace(/%23/g, "#") + (location.hash || ""),
             url: null,
             filename: Path.basename(props.match.url.replace('/view', '')) || 'untitled.dat',
             opener: null,
@@ -45,7 +45,7 @@ export class ViewerPage extends React.Component {
 
     componentWillReceiveProps(props){
         this.setState({
-            path: props.match.url.replace('/view', '') + (location.hash || ""),
+            path: props.match.url.replace('/view', '').replace(/%23/g, "#") + (location.hash || ""),
             filename: Path.basename(props.match.url.replace('/view', '')) || 'untitled.dat'
         }, () => { this.componentDidMount(); });
     }