diff --git a/app/components/Layout.js b/app/components/Layout.js
index d5403e214..4da00c399 100644
--- a/app/components/Layout.js
+++ b/app/components/Layout.js
@@ -97,7 +97,7 @@ class Layout extends React.Component<Props> {
     return (
       <Container column auto>
         <Helmet>
-          <title>Outline</title>
+          <title>{team ? `${team.name} – Outline` : "Outline"}</title>
           <meta
             name="viewport"
             content="width=device-width, initial-scale=1.0"
diff --git a/app/components/PageTitle.js b/app/components/PageTitle.js
index 481646b44..43413e006 100644
--- a/app/components/PageTitle.js
+++ b/app/components/PageTitle.js
@@ -1,15 +1,23 @@
 // @flow
 import * as React from "react";
+import { observer, inject } from "mobx-react";
 import { Helmet } from "react-helmet";
+import AuthStore from "stores/AuthStore";
 
 type Props = {
   title: string,
   favicon?: string,
+  auth: AuthStore,
 };
 
-const PageTitle = ({ title, favicon }: Props) => (
+const { auth } = this.props;
+const { team } = auth;
+
+const PageTitle = observer(({ auth, title, favicon }: Props) => (
   <Helmet>
-    <title>{`${title} - Outline`}</title>
+    <title>
+      {team ? `${title} - ${team.name} - Outline` : `${title} - Outline`}
+    </title>
     <link
       rel="shortcut icon"
       type="image/png"
@@ -18,6 +26,6 @@ const PageTitle = ({ title, favicon }: Props) => (
     />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   </Helmet>
-);
+));
 
-export default PageTitle;
+export default inject("auth")(PageTitle);