diff --git a/lib/client/dom.js b/lib/client/dom.js
index af209efc..d77b712c 100644
--- a/lib/client/dom.js
+++ b/lib/client/dom.js
@@ -1608,7 +1608,9 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog;
                 if (!files || !files.parentElement)
                     current     = filesPassive[0];
                 
-                DOM.setCurrentFile(current);
+                DOM.setCurrentFile(current, {
+                    nohistory: false
+                });
                 
                 return this;
             };
diff --git a/lib/client/listeners.js b/lib/client/listeners.js
index 506ddbff..1236133b 100644
--- a/lib/client/listeners.js
+++ b/lib/client/listeners.js
@@ -334,7 +334,9 @@ var Util, DOM, CloudFunc, CloudCmd;
         
         function pop() {
             Events.add('popstate', function(event) {
-                var path = event.state;
+                var path    = event.state;
+                
+                path        = Util.rmStrOnce(path, CloudFunc.FS);
                 
                 if (path)
                     CloudCmd.loadDir({