diff --git a/__tests__/App.test.jsx b/__tests__/App.test.jsx
index 0a9a9dd58b..01e216659d 100644
--- a/__tests__/App.test.jsx
+++ b/__tests__/App.test.jsx
@@ -4,6 +4,7 @@ import App from '../src/App';
 import api from '../src/api';
 import Dashboard from '../src/pages/Dashboard';
 import Login from '../src/pages/Login';
+import { asyncFlush } from '../jest.setup';
 
 const DEFAULT_ACTIVE_GROUP = 'views_group';
 const DEFAULT_ACTIVE_ITEM = 'views_group_dashboard';
@@ -62,11 +63,15 @@ describe('<App />', () => {
     expect(appWrapper.state().activeGroup).toBe(DEFAULT_ACTIVE_GROUP);
   });
 
-  test('api.logout called from logout button', () => {
-    api.logout = jest.fn();
+  test('api.logout called from logout button', async () => {
+    api.logout = jest.fn().mockImplementation(() => Promise.resolve({}));
     const appWrapper = mount(<App />);
     const logoutButton = appWrapper.find('LogoutButton');
     logoutButton.props().onDevLogout();
+    appWrapper.setState({ activeGroup: 'foo', activeItem: 'bar' });
     expect(api.logout).toHaveBeenCalledTimes(1);
+    await asyncFlush();
+    expect(appWrapper.state().activeItem).toBe(DEFAULT_ACTIVE_ITEM);
+    expect(appWrapper.state().activeGroup).toBe(DEFAULT_ACTIVE_GROUP);
   });
 });
diff --git a/src/App.jsx b/src/App.jsx
index 3852933e6e..cabdf6ddfa 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -76,6 +76,13 @@ class App extends React.Component {
     this.setState({ activeGroup: 'views_group', activeItem: 'views_group_dashboard' });
   }
 
+  onDevLogout = () => {
+    api.logout()
+      .then(() => {
+        this.setState({ activeGroup: 'views_group', activeItem: 'views_group_dashboard' });
+      });
+  }
+
   render () {
     const { activeItem, activeGroup, isNavOpen } = this.state;
     const { logo, loginInfo } = this.props;
@@ -103,7 +110,7 @@ class App extends React.Component {
                 header={(
                   <PageHeader
                     logo={<TowerLogo onClick={this.onLogoClick} />}
-                    avatar={<LogoutButton onDevLogout={api.logout} />}
+                    avatar={<LogoutButton onDevLogout={() => this.onDevLogout()} />}
                     showNavToggle
                     onNavToggle={this.onNavToggle}
                   />