diff --git a/src/plugins/navigation/components/FavoriteButton.tsx b/src/plugins/navigation/components/FavoriteButton.tsx
index 74324d912..b543e8294 100644
--- a/src/plugins/navigation/components/FavoriteButton.tsx
+++ b/src/plugins/navigation/components/FavoriteButton.tsx
@@ -6,7 +6,7 @@
  */
 
 import {styled, IconSize, colors} from 'flipper';
-import IconButton from './IconButton';
+import {IconButton} from './';
 import React from 'react';
 
 type Props = {
diff --git a/src/plugins/navigation/components/SearchBar.tsx b/src/plugins/navigation/components/SearchBar.tsx
index 6464b8440..1ad1b809d 100644
--- a/src/plugins/navigation/components/SearchBar.tsx
+++ b/src/plugins/navigation/components/SearchBar.tsx
@@ -6,9 +6,7 @@
  */
 
 import {styled, SearchBox, SearchInput, Toolbar} from 'flipper';
-import AutoCompleteSheet from './AutoCompleteSheet';
-import IconButton from './IconButton';
-import FavoriteButton from './FavoriteButton';
+import {AutoCompleteSheet, IconButton, FavoriteButton} from './';
 import {AutoCompleteProvider, Bookmark, URI} from '../types';
 import React, {Component} from 'react';
 
diff --git a/src/plugins/navigation/components/Timeline.tsx b/src/plugins/navigation/components/Timeline.tsx
index e36833c26..ac4822e59 100644
--- a/src/plugins/navigation/components/Timeline.tsx
+++ b/src/plugins/navigation/components/Timeline.tsx
@@ -6,7 +6,7 @@
  */
 
 import {colors, FlexCenter, styled, LoadingIndicator} from 'flipper';
-import NavigationInfoBox from './NavigationInfoBox';
+import {NavigationInfoBox} from './';
 import {Bookmark, NavigationEvent, URI} from '../types';
 import React from 'react';
 
diff --git a/src/plugins/navigation/components/index.js b/src/plugins/navigation/components/index.js
deleted file mode 100644
index 719ff37e6..000000000
--- a/src/plugins/navigation/components/index.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright 2018-present Facebook.
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- * @format
- * @flow strict-local
- */
-
-export {default as AutoCompleteSheet} from './AutoCompleteSheet.tsx';
-export {default as BookmarksSidebar} from './BookmarksSidebar.tsx';
-export {default as FavoriteButton} from './FavoriteButton.tsx';
-export {default as IconButton} from './IconButton.tsx';
-export {default as NavigationInfoBox} from './NavigationInfoBox.tsx';
-export {
-  default as RequiredParametersDialog,
-} from './RequiredParametersDialog.tsx';
-export {default as SaveBookmarkDialog} from './SaveBookmarkDialog.tsx';
-export {default as SearchBar} from './SearchBar.tsx';
-export {default as Timeline} from './Timeline.tsx';
diff --git a/src/plugins/navigation/components/index.tsx b/src/plugins/navigation/components/index.tsx
new file mode 100644
index 000000000..f0c2438fd
--- /dev/null
+++ b/src/plugins/navigation/components/index.tsx
@@ -0,0 +1,16 @@
+/**
+ * Copyright 2018-present Facebook.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ * @format
+ */
+
+export {default as AutoCompleteSheet} from './AutoCompleteSheet';
+export {default as BookmarksSidebar} from './BookmarksSidebar';
+export {default as FavoriteButton} from './FavoriteButton';
+export {default as IconButton} from './IconButton';
+export {default as NavigationInfoBox} from './NavigationInfoBox';
+export {default as RequiredParametersDialog} from './RequiredParametersDialog';
+export {default as SaveBookmarkDialog} from './SaveBookmarkDialog';
+export {default as SearchBar} from './SearchBar';
+export {default as Timeline} from './Timeline';
diff --git a/src/plugins/navigation/index.js b/src/plugins/navigation/index.js
index 631335f7b..e123a85e5 100644
--- a/src/plugins/navigation/index.js
+++ b/src/plugins/navigation/index.js
@@ -13,7 +13,7 @@ import {
   SearchBar,
   Timeline,
   RequiredParametersDialog,
-} from './components';
+} from './components/index.tsx';
 import {
   removeBookmark,
   readBookmarksFromDB,