diff --git a/app/templates/accounts.html b/app/templates/accounts.html
index b76fd1b..f8650c6 100644
--- a/app/templates/accounts.html
+++ b/app/templates/accounts.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block page_icon %}👤{% endblock %}
 {% block page_title %}Accounts{% endblock %}
+{% block title_prefix %}Accounts{% endblock %}
 
 {% block content %}
 <div class="page-title-area">
diff --git a/app/templates/base.html b/app/templates/base.html
index 86774c0..dae9de2 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>FlowDeck — {% block page_title %}Home{% endblock %}</title>
+  <title>FlowDeck — {% block title_prefix %}Home{% endblock %}</title>
   <link rel="icon" type="image/svg+xml" href="/static/favicon.svg">
   <link rel="stylesheet" href="/static/css/design-tokens.css?v=1.0">
   <link rel="stylesheet" href="/static/css/app.css?v=2.4.6">
diff --git a/app/templates/board.html b/app/templates/board.html
index 52d2246..803ed44 100644
--- a/app/templates/board.html
+++ b/app/templates/board.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block page_icon %}📁{% endblock %}
 {% block page_title %}Kanban board new{% endblock %}
+{% block title_prefix %}Kanban board new{% endblock %}
 
 {% block content %}
 <!-- Cover image -->
diff --git a/app/templates/dashboard.html b/app/templates/dashboard.html
index 090cfaf..28b0884 100644
--- a/app/templates/dashboard.html
+++ b/app/templates/dashboard.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block page_icon %}🏠{% endblock %}
 {% block page_title %}Home{% endblock %}
+{% block title_prefix %}Home{% endblock %}
 
 {% block content %}
 <div class="page-title-area" style="padding-top: 24px;">
diff --git a/app/templates/gitea_workspace.html b/app/templates/gitea_workspace.html
index b30b807..27a0dd5 100644
--- a/app/templates/gitea_workspace.html
+++ b/app/templates/gitea_workspace.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block page_title %}{{ workspace_name }}{% endblock %}
+{% block title_prefix %}{{ workspace_name }}{% endblock %}
 {% block page_icon %}🔗{% endblock %}
 
 {% block topbar %}
diff --git a/app/templates/library.html b/app/templates/library.html
index 1707528..54a8fc9 100644
--- a/app/templates/library.html
+++ b/app/templates/library.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block page_icon %}📚{% endblock %}
 {% block page_title %}Library{% endblock %}
+{% block title_prefix %}Library{% endblock %}
 
 {% block content %}
 <div class="page-title-area">
diff --git a/app/templates/local_workspace.html b/app/templates/local_workspace.html
index 109b0d5..d16f023 100644
--- a/app/templates/local_workspace.html
+++ b/app/templates/local_workspace.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block page_title %}{{ workspace_name }}{% endblock %}
+{% block title_prefix %}{{ workspace_name }}{% endblock %}
 {% block page_icon %}📁{% endblock %}
 
 {% block topbar %}
diff --git a/app/templates/settings.html b/app/templates/settings.html
index 545c2a0..795a8b0 100644
--- a/app/templates/settings.html
+++ b/app/templates/settings.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block page_title %}Settings{% endblock %}
+{% block title_prefix %}Settings{% endblock %}
 {% block page_icon %}⚙️{% endblock %}
 
 {% block topbar %}
diff --git a/app/templates/trash.html b/app/templates/trash.html
index 0b20ad4..c74d217 100644
--- a/app/templates/trash.html
+++ b/app/templates/trash.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block page_icon %}🗑️{% endblock %}
 {% block page_title %}Trash{% endblock %}
+{% block title_prefix %}Trash{% endblock %}
 
 {% block content %}
 <div class="page-title-area">
diff --git a/app/templates/workspace.html b/app/templates/workspace.html
index 3ad1773..067db61 100644
--- a/app/templates/workspace.html
+++ b/app/templates/workspace.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block page_title %}Workspace{% endblock %}
+{% block title_prefix %}Workspace{% endblock %}
 {% block page_icon %}🏠{% endblock %}
 
 {% block topbar %}
diff --git a/app/templates/workspaces.html b/app/templates/workspaces.html
index 00f5f2e..ed97241 100644
--- a/app/templates/workspaces.html
+++ b/app/templates/workspaces.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block page_title %}Workspaces{% endblock %}
+{% block title_prefix %}Workspaces{% endblock %}
 {% block page_icon %}🏠{% endblock %}
 
 {% block topbar %}