diff --git a/site/src/jsMain/kotlin/com/varabyte/kobweb/site/components/layouts/DocsLayout.kt b/site/src/jsMain/kotlin/com/varabyte/kobweb/site/components/layouts/DocsLayout.kt
index e32d388..18e7d6f 100644
--- a/site/src/jsMain/kotlin/com/varabyte/kobweb/site/components/layouts/DocsLayout.kt
+++ b/site/src/jsMain/kotlin/com/varabyte/kobweb/site/components/layouts/DocsLayout.kt
@@ -119,14 +119,17 @@ fun DocsLayout(content: @Composable () -> Unit) {
     val ctx = rememberPageContext()
 
     val articleHandle = ctx.markdown?.let { ctx.route.toArticleHandle() }
-    val title = buildString {
-        append("Docs")
+    val title = buildList {
         if (articleHandle != null) {
-            append(" - ${articleHandle.category.title}")
-            articleHandle.subcategory.title.takeIf { it.isNotEmpty() }?.let { append(" - $it") }
-            articleHandle.article.title.takeIf { it.isNotEmpty() }?.let { append(" - $it") }
+            articleHandle.article.title.takeIf { it.isNotEmpty() }?.let { add(it) }
+            articleHandle.subcategory.title.takeIf { it.isNotEmpty() }?.let { add(it) }
+            articleHandle.category.title.takeIf { it.isNotEmpty() }?.let { add(it) }
         }
-    }
+
+        if (this.isEmpty()) {
+            add("Docs")
+        }
+    }.joinToString(" - ")
 
     PageLayout(title) {
         MobileLocalNav()
diff --git a/site/src/jsMain/kotlin/com/varabyte/kobweb/site/components/layouts/PageLayout.kt b/site/src/jsMain/kotlin/com/varabyte/kobweb/site/components/layouts/PageLayout.kt
index 7cb3f3b..1beebcd 100644
--- a/site/src/jsMain/kotlin/com/varabyte/kobweb/site/components/layouts/PageLayout.kt
+++ b/site/src/jsMain/kotlin/com/varabyte/kobweb/site/components/layouts/PageLayout.kt
@@ -22,7 +22,7 @@ import org.jetbrains.compose.web.dom.Div
 @Composable
 fun PageLayout(title: String, content: @Composable () -> Unit) {
     LaunchedEffect(title) {
-        document.title = "Kobweb - $title"
+        document.title = "$title | Kobweb"
     }
 
     val ctx = rememberPageContext()