diff --git a/frontend/components/Layout/Layout.js b/frontend/components/Layout/Layout.js
index 33076f9b0..44703b2b9 100644
--- a/frontend/components/Layout/Layout.js
+++ b/frontend/components/Layout/Layout.js
@@ -2,6 +2,7 @@ import React from 'react';
 import { browserHistory, Link } from 'react-router';
 import Helmet from 'react-helmet';
 import { observer } from 'mobx-react';
+import { injectOffline } from 'components/Offline';
 import keydown from 'react-keydown';
 import _ from 'lodash';
 
@@ -16,6 +17,7 @@ import classNames from 'classnames/bind';
 const cx = classNames.bind(styles);
 
 @observer(['user'])
+@injectOffline
 class Layout extends React.Component {
   static propTypes = {
     children: React.PropTypes.node,
@@ -25,6 +27,7 @@ class Layout extends React.Component {
     loading: React.PropTypes.bool,
     user: React.PropTypes.object.isRequired,
     search: React.PropTypes.bool,
+    offline: React.PropTypes.bool,
   }
 
   static defaultProps = {
@@ -54,9 +57,15 @@ class Layout extends React.Component {
               : 'Atlas' }
         />
 
-        { this.props.loading ? (
+        { this.props.loading && (
           <LoadingIndicator />
-        ) : null }
+        ) }
+
+        { this.props.offline && (
+          <Alert offline>
+            It looks like you're offline. Reconnect to restore access to all of your documents 📚
+          </Alert>
+        ) }
 
         <div className={ cx(styles.header) }>
           <div className={ styles.headerLeft }>
diff --git a/frontend/components/Offline/Offline.js b/frontend/components/Offline/Offline.js
new file mode 100644
index 000000000..3d9eb7952
--- /dev/null
+++ b/frontend/components/Offline/Offline.js
@@ -0,0 +1,43 @@
+import React from 'react';
+
+class Offline extends React.Component {
+  static propTypes = {
+    children: React.PropTypes.node,
+  };
+
+  static childContextTypes = {
+    offline: React.PropTypes.bool,
+  };
+
+  state = {
+    offline: false,
+  }
+
+  getChildContext() {
+    return {
+      offline: this.state.offline,
+    };
+  }
+
+  componentDidMount = () => {
+    window.addEventListener('offline', this.handleConnectionState);
+    window.addEventListener('online', this.handleConnectionState);
+  }
+
+  componentWillUnmount = () => {
+    window.removeEventListener('offline', this.handleConnectionState);
+    window.removeEventListener('online', this.handleConnectionState);
+  };
+
+  handleConnectionState = () => {
+    this.setState({
+      offline: !navigator.onLine,
+    });
+  }
+
+  render() {
+    return React.Children.only(this.props.children);
+  }
+}
+
+export default Offline;
diff --git a/frontend/components/Offline/index.js b/frontend/components/Offline/index.js
new file mode 100644
index 000000000..5bc9f908c
--- /dev/null
+++ b/frontend/components/Offline/index.js
@@ -0,0 +1,7 @@
+import Offline from './Offline';
+import injectOffline from './injectOffline';
+
+export {
+  Offline,
+  injectOffline,
+}
diff --git a/frontend/components/Offline/injectOffline.js b/frontend/components/Offline/injectOffline.js
new file mode 100644
index 000000000..5bb665095
--- /dev/null
+++ b/frontend/components/Offline/injectOffline.js
@@ -0,0 +1,19 @@
+import React from 'react';
+
+const injectOffline = (WrappedComponent) => {
+  return class OfflineWrapper extends React.Component {
+    static contextTypes = {
+      offline: React.PropTypes.bool,
+    };
+
+    render() {
+      const newProps = {
+        offline: this.context.offline,
+      };
+
+      return (<WrappedComponent { ...this.props } { ...newProps } />);
+    }
+  };
+};
+
+export default injectOffline;
diff --git a/frontend/index.js b/frontend/index.js
index 83636a3fb..14778eb00 100644
--- a/frontend/index.js
+++ b/frontend/index.js
@@ -6,6 +6,7 @@ import Route from 'react-router/lib/Route';
 import IndexRoute from 'react-router/lib/IndexRoute';
 import Redirect from 'react-router/lib/Redirect';
 import History from 'utils/History';
+import { Offline } from 'components/Offline';
 
 import stores from 'stores';
 
@@ -45,35 +46,37 @@ function requireAuth(nextState, replace) {
 render((
   <div style={{ display: 'flex', flex: 1, height: '100%' }}>
     <Provider { ...stores }>
-      <Router history={ History }>
-        <Route path="/" component={ Application }>
-          <IndexRoute component={ Home } />
+      <Offline>
+        <Router history={ History }>
+          <Route path="/" component={ Application }>
+            <IndexRoute component={ Home } />
 
-          <Route path="/dashboard" component={ Dashboard } onEnter={ requireAuth } />
-          <Route path="/collections/:id" component={ Atlas } onEnter={ requireAuth } />
-          <Route
-            path="/collections/:id/new"
-            component={ DocumentEdit }
-            onEnter={ requireAuth }
-            newDocument
-          />
-          <Route path="/d/:id" component={ DocumentScene } onEnter={ requireAuth } />
-          <Route path="/d/:id/edit" component={ DocumentEdit } onEnter={ requireAuth } />
-          <Route
-            path="/d/:id/new"
-            component={ DocumentEdit }
-            onEnter={ requireAuth }
-            newChildDocument
-          />
+            <Route path="/dashboard" component={ Dashboard } onEnter={ requireAuth } />
+            <Route path="/collections/:id" component={ Atlas } onEnter={ requireAuth } />
+            <Route
+              path="/collections/:id/new"
+              component={ DocumentEdit }
+              onEnter={ requireAuth }
+              newDocument
+            />
+            <Route path="/d/:id" component={ DocumentScene } onEnter={ requireAuth } />
+            <Route path="/d/:id/edit" component={ DocumentEdit } onEnter={ requireAuth } />
+            <Route
+              path="/d/:id/new"
+              component={ DocumentEdit }
+              onEnter={ requireAuth }
+              newChildDocument
+            />
 
-          <Route path="/search" component={ Search } onEnter={ requireAuth } />
+            <Route path="/search" component={ Search } onEnter={ requireAuth } />
 
-          <Route path="/auth/slack" component={ SlackAuth } />
+            <Route path="/auth/slack" component={ SlackAuth } />
 
-          <Route path="/404" component={ Error404 } />
-          <Redirect from="*" to="/404" />
-        </Route>
-      </Router>
+            <Route path="/404" component={ Error404 } />
+            <Redirect from="*" to="/404" />
+          </Route>
+        </Router>
+      </Offline>
     </Provider>
     { __DEV__ && <DevTools position={{ bottom: 0, right: 0 }} /> }
   </div>