diff --git a/src/documents/index.html.coffee b/src/documents/index.html.coffee
index d376ff3..cfd9853 100644
--- a/src/documents/index.html.coffee
+++ b/src/documents/index.html.coffee
@@ -16,6 +16,9 @@ aside '.app', ->
 			span '.link.link-page', ->
 				text 'Page'
 
+			span '.link.link-logout', ->
+				text 'Logout'
+
 		span '.right.show-page', ->
 			#span '.status', ->
 			#	'Changes saved at 10:41am'
diff --git a/src/documents/scripts/views/app.js.coffee b/src/documents/scripts/views/app.js.coffee
index 926654e..d5d430b 100644
--- a/src/documents/scripts/views/app.js.coffee
+++ b/src/documents/scripts/views/app.js.coffee
@@ -64,8 +64,8 @@ class App extends View
 			loggedInUser: currentUser
 			onlogin: (args...) ->
 				# ignore as we listen to post message
-			onlogout: ->
-				localStorage.setItem('currentUser', '')
+			onlogout: =>
+				@applyLogout()
 		)
 
 		# Login the user if we already have one
@@ -256,6 +256,15 @@ class App extends View
 		# Chain
 		@
 
+	applyLogout: ->
+		localStorage.removeItem('currentUser')
+		@currentSite = null
+		@currentFileCollection = null
+		@currentFile = null
+		@editView = null
+		@setAppMode('login')
+		@navigate('/')
+		@
 
 
 	# ---------------------------------
@@ -429,6 +438,9 @@ class App extends View
 					site: @currentSite
 					fileCollection: @currentFileCollection
 				})
+			when $target.hasClass('link-logout')
+				@applyLogout()
+				navigator.id?.logout?()
 
 		# Chain
 		@
diff --git a/src/documents/styles/app.css.styl b/src/documents/styles/app.css.styl
index bd1ee3e..efb24cd 100644
--- a/src/documents/styles/app.css.styl
+++ b/src/documents/styles/app.css.styl
@@ -432,6 +432,15 @@ select.collection-list
 			&:before
 				border: heightSwitch solid colorPageBackground
 
+		&.link-logout
+			z-index: 2
+			padding-left: (paddingBodySides * 1.5)
+			margin-left:  (paddingBodySides * -1)
+			&, &:after
+				background: colorCancelBackground
+			&:before
+				border: heightSwitch solid colorCancelBackground
+
 		&:before
 			width: 0
 			height: 0