diff --git a/web/sidebar/left-layout-aside.react.js b/web/sidebar/left-layout-aside.react.js
--- a/web/sidebar/left-layout-aside.react.js
+++ b/web/sidebar/left-layout-aside.react.js
@@ -2,11 +2,11 @@
 
 import * as React from 'react';
 
-import AppSwitcher from './app-switcher.react.js';
 import CommunityPicker from './community-picker.react.js';
 import css from './left-layout-aside.css';
 import SettingsSwitcher from './settings-switcher.react.js';
 import { useSelector } from '../redux/redux-utils.js';
+import AppSwitcher from '../topbar/app-switcher.react.js';
 
 function LeftLayoutAside(): React.Node {
   const navInfo = useSelector(state => state.navInfo);
diff --git a/web/sidebar/app-switcher.react.js b/web/topbar/app-switcher.react.js
rename from web/sidebar/app-switcher.react.js
rename to web/topbar/app-switcher.react.js
--- a/web/sidebar/app-switcher.react.js
+++ b/web/topbar/app-switcher.react.js
@@ -9,11 +9,11 @@
   unreadCount,
 } from 'lib/selectors/thread-selectors.js';
 
-import css from './left-layout-aside.css';
-import NavigationPanel from './navigation-panel.react.js';
 import { updateNavInfoActionType } from '../redux/action-types.js';
 import { useSelector } from '../redux/redux-utils.js';
 import { navTabSelector } from '../selectors/nav-selectors.js';
+import css from '../sidebar/left-layout-aside.css';
+import NavigationPanel from '../sidebar/navigation-panel.react.js';
 
 function AppSwitcher(): React.Node {
   const activeChatThreadID = useSelector(