diff --git a/src/zen/common/sys/ui/ZenSpaceRoutingNavigation.sys.mjs b/src/zen/common/sys/ui/ZenSpaceRoutingNavigation.sys.mjs
index fcf85bb19..ce0fef437 100644
--- a/src/zen/common/sys/ui/ZenSpaceRoutingNavigation.sys.mjs
+++ b/src/zen/common/sys/ui/ZenSpaceRoutingNavigation.sys.mjs
@@ -29,7 +29,8 @@ export class ZenSpaceRoutingNavigation extends ZenUIComponent {
     if (
       !aWebProgress?.isTopLevel ||
       !(aStateFlags & wpl.STATE_START) ||
-      !(aStateFlags & wpl.STATE_IS_DOCUMENT)
+      !(aStateFlags & wpl.STATE_IS_DOCUMENT) ||
+      aStateFlags & wpl.STATE_RESTORING
     ) {
       return;
     }
diff --git a/src/zen/space-routing/ZenSpaceRoutingManager.sys.mjs b/src/zen/space-routing/ZenSpaceRoutingManager.sys.mjs
index e9cf24438..8454fb488 100644
--- a/src/zen/space-routing/ZenSpaceRoutingManager.sys.mjs
+++ b/src/zen/space-routing/ZenSpaceRoutingManager.sys.mjs
@@ -389,9 +389,14 @@ class nsZenSpaceRoutingManager {
   }
 
   /**
-   * Saves all routes
+   * Saves all routes. The list of
+   * routes is stripped of empty routes
+   * before being saved
    */
   saveRoutes() {
+    this.#file.data.routes = this.#file.data.routes.filter(
+      route => route.reference.trim() !== ""
+    );
     this.#writeToDisk();
   }
 
diff --git a/src/zen/space-routing/zen-space-routing.css b/src/zen/space-routing/zen-space-routing.css
index 172263809..a05bec54a 100644
--- a/src/zen/space-routing/zen-space-routing.css
+++ b/src/zen/space-routing/zen-space-routing.css
@@ -27,11 +27,6 @@
   --sr-border-radius: 12px;
 }
 
-.dialog-button-box {
-  /* Remove default dialog buttons */
-  display: none !important;
-}
-
 window {
   height: var(--sr-height);
   max-height: var(--sr-height);
@@ -123,10 +118,6 @@ p {
   min-height: unset;
   height: 26px;
   padding: 4px;
-}
-
-.select,
-.select * {
   background-color: var(--select-background-color) !important;
   color: var(--text-color);
   margin: 0;
@@ -139,7 +130,6 @@ p {
   }
 }
 
-menulist[image] .menulist-icon,
 menulist[image]::part(icon) {
   width: 16px;
   height: 16px;
@@ -151,10 +141,6 @@ menulist[image]::part(icon) {
   padding-left: 2px;
 }
 
-menulist {
-  -moz-box-align: center;
-}
-
 .sr-rule-row {
   display: flex;
   align-items: center;
@@ -176,8 +162,7 @@ menulist {
   margin-left: 87px;
 }
 
-.input,
-.input * {
+.input {
   background-color: var(--input-background-color);
   color: var(--text-color);
   margin: 0;
@@ -185,8 +170,7 @@ menulist {
   flex-grow: 1;
 }
 
-.invalid,
-.invalid * {
+.invalid {
   color: var(--text-color-error) !important;
 
   text-decoration-line: underline;