diff --git a/copyparty/web/browser.js b/copyparty/web/browser.js
index c5818f82..47f2dac1 100644
--- a/copyparty/web/browser.js
+++ b/copyparty/web/browser.js
@@ -6409,6 +6409,14 @@ function show_md(md, name, div, url, depth) {
 			els[a].setAttribute('href', '#md-' + href.slice(1));
 		}
 		set_tabindex();
+		var hash = location.hash;
+		if (hash.startsWith('#md-'))
+			setTimeout(function () {
+				try {
+					QS(hash).scrollIntoView();
+				}
+				catch (ex) { }
+			}, 1);
 	}
 	catch (ex) {
 		toast.warn(10, errmsg + ex);
diff --git a/copyparty/web/md.js b/copyparty/web/md.js
index c0385d5e..86d43b82 100644
--- a/copyparty/web/md.js
+++ b/copyparty/web/md.js
@@ -1,12 +1,13 @@
 "use strict";
 
-var dom_toc = ebi('toc');
-var dom_wrap = ebi('mw');
-var dom_hbar = ebi('mh');
-var dom_nav = ebi('mn');
-var dom_pre = ebi('mp');
-var dom_src = ebi('mt');
-var dom_navtgl = ebi('navtoggle');
+var dom_toc = ebi('toc'),
+    dom_wrap = ebi('mw'),
+    dom_hbar = ebi('mh'),
+    dom_nav = ebi('mn'),
+    dom_pre = ebi('mp'),
+    dom_src = ebi('mt'),
+    dom_navtgl = ebi('navtoggle'),
+    hash0 = location.hash;
 
 
 // chrome 49 needs this
@@ -35,12 +36,12 @@ var dbg = function () { };
 
 // add navbar
 (function () {
-    var parts = get_evpath().split('/'), link = '', o;
-    for (var a = 0, aa = parts.length - 2; a <= aa; a++) {
+    var parts = (get_evpath().slice(0, -1).split('?')[0] + '?v').split('/'), link = '', o;
+    for (var a = 0, aa = parts.length - 1; a <= aa; a++) {
         link += parts[a] + (a < aa ? '/' : '');
         o = mknod('a');
         o.setAttribute('href', link);
-        o.textContent = uricom_dec(parts[a]) || 'top';
+        o.textContent = uricom_dec(parts[a].split('?')[0]) || 'top';
         dom_nav.appendChild(o);
     }
 })();
@@ -256,7 +257,7 @@ function convert_markdown(md_text, dest_dom) {
         var html = dom_li.innerHTML;
         dom_li.innerHTML =
             '<span class="todo_' + clas + '">' + char + '</span>' +
-            html.substr(html.indexOf('>') + 1);
+            html.slice(html.indexOf('>') + 1);
     }
 
     // separate <code> for each line in <pre>
@@ -328,6 +329,15 @@ function convert_markdown(md_text, dest_dom) {
         catch (ex) {
             md_plug_err(ex, ext[1]);
         }
+
+    if (hash0)
+        setTimeout(function () {
+            try {
+                QS(hash0).scrollIntoView();
+                hash0 = '';
+            }
+            catch (ex) { }
+        }, 1);
 }
 
 
diff --git a/copyparty/web/mde.js b/copyparty/web/mde.js
index 7d882f20..f8de0feb 100644
--- a/copyparty/web/mde.js
+++ b/copyparty/web/mde.js
@@ -7,7 +7,7 @@ var dom_md = ebi('mt');
 
 (function () {
     var n = document.location + '';
-    n = n.substr(n.indexOf('//') + 2).split('?')[0].split('/');
+    n = (n.slice(n.indexOf('//') + 2).split('?')[0] + '?v').split('/');
     n[0] = 'top';
     var loc = [];
     var nav = [];
@@ -15,7 +15,7 @@ var dom_md = ebi('mt');
         if (a > 0)
             loc.push(n[a]);
 
-        var dec = uricom_dec(n[a]).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+        var dec = uricom_dec(n[a].split('?')[0]).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 
         nav.push('<a href="/' + loc.join('/') + '">' + dec + '</a>');
     }