diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index c92bc5121..ad67db8ec 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -642,7 +642,8 @@ define([
                 };
                 Cryptpad.setPadTitle(data, function (err, obj) {
                     if (!err && !(obj && obj.notStored)) {
-                        // Pad is stored: hide the hash
+                        // No error and the pad was correctly stored
+                        // hide the hash
                         var opts = parsed.getOptions();
                         var hash = Utils.Hash.getHiddenHashFromKeys(parsed.type, secret, opts);
                         if (window.history && window.history.replaceState) {
@@ -677,6 +678,16 @@ define([
                     forceSave: true
                 };
                 Cryptpad.setPadTitle(data, function (err) {
+                    if (!err && !(obj && obj.notStored)) {
+                        // No error and the pad was correctly stored
+                        // hide the hash
+                        var opts = parsed.getOptions();
+                        var hash = Utils.Hash.getHiddenHashFromKeys(parsed.type, secret, opts);
+                        if (window.history && window.history.replaceState) {
+                            if (!/^#/.test(hash)) { hash = '#' + hash; }
+                            window.history.replaceState({}, window.document.title, hash);
+                        }
+                    }
                     cb({error: err});
                 });
             });
diff --git a/www/drive/main.js b/www/drive/main.js
index 64e990979..6e22e6b27 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -51,6 +51,12 @@ define([
                 // Add a shared folder!
                 Cryptpad.addSharedFolder(null, secret, function (id) {
                     window.CryptPad_newSharedFolder = id;
+
+                    // Clear the hash now that the secrets have been generated
+                    if (window.history && window.history.replaceState && hash) {
+                        window.history.replaceState({}, window.document.title, '#');
+                    }
+
                     cb();
                 });
                 return;
@@ -58,7 +64,7 @@ define([
                 var id = Utils.Util.createRandomInteger();
                 window.CryptPad_newSharedFolder = id;
                 var data = {
-                    href: Utils.Hash.getRelativeHref(href),
+                    href: Utils.Hash.getRelativeHref(Cryptpad.currentPad.href),
                     password: secret.password
                 };
                 return void Cryptpad.loadSharedFolder(id, data, cb);
@@ -119,9 +125,9 @@ define([
                 sframeChan.event('EV_DRIVE_REMOVE', data);
             });
         };
-        var addData = function (meta) {
+        var addData = function (meta, Cryptpad) {
             if (!window.CryptPad_newSharedFolder) { return; }
-            meta.anonSFHref = href;
+            meta.anonSFHref = Cryptpad.currentPad.href;
         };
         SFCommonO.start({
             hash: hash,