diff --git a/layouts/alias.html b/layouts/alias.html
index efa43dfc..2bb5c306 100644
--- a/layouts/alias.html
+++ b/layouts/alias.html
@@ -7,8 +7,11 @@
     <meta charset="utf-8">
     <script>
       let pathSegments = window.location.href.split('/');
-      let lastSegment = pathSegments[pathSegments.length - 1].toLowerCase();
-      let newUrl = "{{ .Permalink }}" + lastSegment;
+      let lastSegment = pathSegments[pathSegments.length - 1]?.toLowerCase() ?? "";
+      if (lastSegment === "") {
+        lastSegment = pathSegments[pathSegments.length - 2]?.toLowerCase() ?? "";
+      }
+      let newUrl = "{{ .Permalink }}" + "#" + lastSegment;
       let pageType = "{{ with .Page }}{{ .Type }}{{ end }}";
       if (pageType === "stream") {
           window.location.href = newUrl;
diff --git a/static/js/tabs.js b/static/js/tabs.js
index d822903d..f2ea6ee0 100644
--- a/static/js/tabs.js
+++ b/static/js/tabs.js
@@ -33,7 +33,7 @@ split_url = url_string.split('#');
 maturity_param = split_url[1];
 
 // If there's a parameter in the URL, open that maturity level
-let maturityElementByUrlAlias = getMaturityLevelByUrlAlias(url_string);
+let maturityElementByUrlAlias = getMaturityLevelByUrlAlias(maturity_param);
 if (maturityElementByUrlAlias !== null) {
   element = maturityElementByUrlAlias;
 } else if (maturity_param == 'maturity2' || maturity_param == 'maturity3') {
@@ -46,9 +46,6 @@ if(typeof(element) != 'undefined' && element != null){
     element.click();
 }
 
-function getMaturityLevelByUrlAlias(url) {
-  const pathSegments = url.split('/');
-
-  const lastSegment = pathSegments[pathSegments.length - 1];
-  return document.querySelector(`[maturity-url-alias$="${lastSegment}"]`);
+function getMaturityLevelByUrlAlias(maturity_param) {
+  return document.querySelector(`[maturity-url-alias$="${maturity_param}"]`);
 }
\ No newline at end of file