diff --git a/lib/client/listeners.js b/lib/client/listeners.js
index 190939ce..7c9dd231 100644
--- a/lib/client/listeners.js
+++ b/lib/client/listeners.js
@@ -387,16 +387,14 @@ var Util, DOM, CloudCmd;
         
         function pop() {
             Events.add('popstate', function(event) {
-                var path;
+                var path = event.state;
                 
-                if (!event.state)
-                    CloudCmd.route(location.hash);
-                else {
-                    path   = event.state + '?json';
+                if (path)
                     CloudCmd.ajaxLoad(path, {
                         nohistory: true
                     });
-                }
+                else
+                    CloudCmd.route(location.hash);
             });
         }