diff --git a/src/client/theme-default/components/NavBarLinks.vue b/src/client/theme-default/components/NavBarLinks.vue
index 9fcd03d2..ab02e2b4 100644
--- a/src/client/theme-default/components/NavBarLinks.vue
+++ b/src/client/theme-default/components/NavBarLinks.vue
@@ -1,12 +1,12 @@
 <template>
-  <nav class="nav-links">
+  <nav class="nav-links" v-if="navData || repoInfo">
     <template v-if="navData">
       <template v-for="item of navData">
         <NavDropdownLink v-if="item.items" :item="item" />
         <NavBarLink v-else :item="item" />
       </template>
-      <NavBarLink v-if="repoInfo" :item="repoInfo" />
     </template>
+    <NavBarLink v-if="repoInfo" :item="repoInfo" />
   </nav>
 </template>
 
diff --git a/src/client/theme-default/components/PageEdit.vue b/src/client/theme-default/components/PageEdit.vue
index c76aecdd..8070dedf 100644
--- a/src/client/theme-default/components/PageEdit.vue
+++ b/src/client/theme-default/components/PageEdit.vue
@@ -1,11 +1,14 @@
 <template>
   <footer class="page-edit">
-    <div v-if="editLink" class="edit-link">
-      <a :href="editLink" target="_blank" rel="noopener noreferrer">
-        {{ editLinkText }}
-        <OutboundLink />
-      </a>
-    </div>
+    <a
+      v-if="editLink"
+      :href="editLink"
+      target="_blank"
+      rel="noopener noreferrer"
+    >
+      {{ editLinkText }}
+      <OutboundLink />
+    </a>
   </footer>
 </template>
 
@@ -17,11 +20,9 @@
   padding-bottom: 1rem;
   overflow: auto;
 }
-.page-edit .edit-link {
-  display: inline-block;
-}
-.page-edit .edit-link a {
-  color: #4e6e8e;
+
+.page-edit a {
+  color: var(--text-color);
   margin-right: 0.25rem;
 }
 </style>