diff --git a/ignite-html-router.js b/ignite-html-router.js
index 4918a42..5f02754 100644
--- a/ignite-html-router.js
+++ b/ignite-html-router.js
@@ -301,24 +301,35 @@ class Router {
 
         if (refresh) {
             if (Router.hashMode) {
-                //In hash mode the route can't start with / or #, we have to handle it here.
-                if (route.startsWith("/") || route.startsWith("#")) {
-                    route = route.substr(1);
+                //In hash mode the route can't start with #
+                if (route.startsWith("#")) {
+                    route = route.substring(1);
+                }
+
+                //If the route starts with a / set the hash to the route, otherwise append the route
+                if (route.startsWith("/")) {
+                    window.location.hash = route.substring(1);
+                } else {
+                    window.location.hash = window.location.hash.substring(0, window.location.hash.lastIndexOf("/") + 1) + route;
                 }
 
-                window.location.hash = route;
                 window.location.reload();
             } else {
                 window.location.href = route;
             }
         } else {
             if (Router.hashMode) {
-                //In hash mode the route can't start with / or #, we have to handle it here.
-                if (route.startsWith("/") || route.startsWith("#")) {
-                    route = route.substr(1);
+                //In hash mode the route can't start with #
+                if (route.startsWith("#")) {
+                    route = route.substring(1);
                 }
 
-                window.location.hash = route;
+                //If the route starts with a / set the hash to the route, otherwise append the route
+                if (route.startsWith("/")) {
+                    window.location.hash = route.substring(1);
+                } else {
+                    window.location.hash = window.location.hash.substring(0, window.location.hash.lastIndexOf("/") + 1) + route;
+                }
             } else {
                 window.history.pushState(route, route, route);
             }
@@ -371,6 +382,7 @@ class Router {
 
         //If hash mode is set and we have a hash location, get it and split it.
         if (Router.hashMode && window.location.hash && window.location.hash.length > 0) {
+            //Skip the # symbol
             var path = window.location.hash.substring(1);
 
             //If the path contains ? then remove the query.