diff --git a/frontend/src/AddSeries/ImportSeries/SelectFolder/ImportSeriesRootFolderRowConnector.js b/frontend/src/AddSeries/ImportSeries/SelectFolder/ImportSeriesRootFolderRowConnector.js
deleted file mode 100644
index f0fb03921..000000000
--- a/frontend/src/AddSeries/ImportSeries/SelectFolder/ImportSeriesRootFolderRowConnector.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { deleteRootFolder } from 'Store/Actions/rootFolderActions';
-import ImportSeriesRootFolderRow from './ImportSeriesRootFolderRow';
-
-function createMapStateToProps() {
-  return createSelector(
-    () => {
-      return {
-      };
-    }
-  );
-}
-
-const mapDispatchToProps = {
-  deleteRootFolder
-};
-
-class ImportSeriesRootFolderRowConnector extends Component {
-
-  //
-  // Listeners
-
-  onDeletePress = () => {
-    this.props.deleteRootFolder({ id: this.props.id });
-  }
-
-  //
-  // Render
-
-  render() {
-    return (
-      <ImportSeriesRootFolderRow
-        {...this.props}
-        onDeletePress={this.onDeletePress}
-      />
-    );
-  }
-}
-
-ImportSeriesRootFolderRowConnector.propTypes = {
-  id: PropTypes.number.isRequired,
-  deleteRootFolder: PropTypes.func.isRequired
-};
-
-export default connect(createMapStateToProps, mapDispatchToProps)(ImportSeriesRootFolderRowConnector);
diff --git a/frontend/src/AddSeries/ImportSeries/SelectFolder/ImportSeriesSelectFolder.js b/frontend/src/AddSeries/ImportSeries/SelectFolder/ImportSeriesSelectFolder.js
index 13b9d5f6d..67df490ea 100644
--- a/frontend/src/AddSeries/ImportSeries/SelectFolder/ImportSeriesSelectFolder.js
+++ b/frontend/src/AddSeries/ImportSeries/SelectFolder/ImportSeriesSelectFolder.js
@@ -2,39 +2,15 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { icons, kinds, sizes } from 'Helpers/Props';
 import Button from 'Components/Link/Button';
-import FieldSet from 'Components/FieldSet';
 import Icon from 'Components/Icon';
+import FieldSet from 'Components/FieldSet';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import FileBrowserModal from 'Components/FileBrowser/FileBrowserModal';
 import PageContent from 'Components/Page/PageContent';
 import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
-import Table from 'Components/Table/Table';
-import TableBody from 'Components/Table/TableBody';
-import ImportSeriesRootFolderRowConnector from './ImportSeriesRootFolderRowConnector';
+import RootFolders from 'RootFolder/RootFolders';
 import styles from './ImportSeriesSelectFolder.css';
 
-const rootFolderColumns = [
-  {
-    name: 'path',
-    label: 'Path',
-    isVisible: true
-  },
-  {
-    name: 'freeSpace',
-    label: 'Free Space',
-    isVisible: true
-  },
-  {
-    name: 'unmappedFolders',
-    label: 'Unmapped Folders',
-    isVisible: true
-  },
-  {
-    name: 'actions',
-    isVisible: true
-  }
-];
-
 class ImportSeriesSelectFolder extends Component {
 
   //
@@ -110,26 +86,13 @@ class ImportSeriesSelectFolder extends Component {
                 {
                   items.length > 0 ?
                     <div className={styles.recentFolders}>
-                      <FieldSet legend="Recent Folders">
-                        <Table
-                          columns={rootFolderColumns}
-                        >
-                          <TableBody>
-                            {
-                              items.map((rootFolder) => {
-                                return (
-                                  <ImportSeriesRootFolderRowConnector
-                                    key={rootFolder.id}
-                                    id={rootFolder.id}
-                                    path={rootFolder.path}
-                                    freeSpace={rootFolder.freeSpace}
-                                    unmappedFolders={rootFolder.unmappedFolders}
-                                  />
-                                );
-                              })
-                            }
-                          </TableBody>
-                        </Table>
+                      <FieldSet legend="Root Folders">
+                        <RootFolders
+                          isFetching={isFetching}
+                          isPopulated={isPopulated}
+                          error={error}
+                          items={items}
+                        />
                       </FieldSet>
 
                       <Button
@@ -181,8 +144,7 @@ ImportSeriesSelectFolder.propTypes = {
   isPopulated: PropTypes.bool.isRequired,
   error: PropTypes.object,
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
-  onNewRootFolderSelect: PropTypes.func.isRequired,
-  onDeleteRootFolderPress: PropTypes.func.isRequired
+  onNewRootFolderSelect: PropTypes.func.isRequired
 };
 
 export default ImportSeriesSelectFolder;
diff --git a/frontend/src/AddSeries/ImportSeries/SelectFolder/ImportSeriesSelectFolderConnector.js b/frontend/src/AddSeries/ImportSeries/SelectFolder/ImportSeriesSelectFolderConnector.js
index 60729cd6a..50f723d4e 100644
--- a/frontend/src/AddSeries/ImportSeries/SelectFolder/ImportSeriesSelectFolderConnector.js
+++ b/frontend/src/AddSeries/ImportSeries/SelectFolder/ImportSeriesSelectFolderConnector.js
@@ -5,7 +5,7 @@ import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { push } from 'react-router-redux';
 import createSystemStatusSelector from 'Store/Selectors/createSystemStatusSelector';
-import { fetchRootFolders, addRootFolder, deleteRootFolder } from 'Store/Actions/rootFolderActions';
+import { fetchRootFolders, addRootFolder } from 'Store/Actions/rootFolderActions';
 import ImportSeriesSelectFolder from './ImportSeriesSelectFolder';
 
 function createMapStateToProps() {
@@ -24,7 +24,6 @@ function createMapStateToProps() {
 const mapDispatchToProps = {
   fetchRootFolders,
   addRootFolder,
-  deleteRootFolder,
   push
 };
 
@@ -60,10 +59,6 @@ class ImportSeriesSelectFolderConnector extends Component {
     this.props.addRootFolder({ path });
   }
 
-  onDeleteRootFolderPress = (id) => {
-    this.props.deleteRootFolder({ id });
-  }
-
   //
   // Render
 
@@ -72,7 +67,6 @@ class ImportSeriesSelectFolderConnector extends Component {
       <ImportSeriesSelectFolder
         {...this.props}
         onNewRootFolderSelect={this.onNewRootFolderSelect}
-        onDeleteRootFolderPress={this.onDeleteRootFolderPress}
       />
     );
   }
@@ -84,7 +78,6 @@ ImportSeriesSelectFolderConnector.propTypes = {
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
   fetchRootFolders: PropTypes.func.isRequired,
   addRootFolder: PropTypes.func.isRequired,
-  deleteRootFolder: PropTypes.func.isRequired,
   push: PropTypes.func.isRequired
 };
 
diff --git a/frontend/src/AddSeries/ImportSeries/SelectFolder/ImportSeriesRootFolderRow.css b/frontend/src/RootFolder/RootFolderRow.css
similarity index 100%
rename from frontend/src/AddSeries/ImportSeries/SelectFolder/ImportSeriesRootFolderRow.css
rename to frontend/src/RootFolder/RootFolderRow.css
diff --git a/frontend/src/AddSeries/ImportSeries/SelectFolder/ImportSeriesRootFolderRow.js b/frontend/src/RootFolder/RootFolderRow.js
similarity index 86%
rename from frontend/src/AddSeries/ImportSeries/SelectFolder/ImportSeriesRootFolderRow.js
rename to frontend/src/RootFolder/RootFolderRow.js
index 89ea713a0..2a4038a54 100644
--- a/frontend/src/AddSeries/ImportSeries/SelectFolder/ImportSeriesRootFolderRow.js
+++ b/frontend/src/RootFolder/RootFolderRow.js
@@ -6,9 +6,9 @@ import IconButton from 'Components/Link/IconButton';
 import Link from 'Components/Link/Link';
 import TableRow from 'Components/Table/TableRow';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
-import styles from './ImportSeriesRootFolderRow.css';
+import styles from './RootFolderRow.css';
 
-function ImportSeriesRootFolderRow(props) {
+function RootFolderRow(props) {
   const {
     id,
     path,
@@ -49,7 +49,7 @@ function ImportSeriesRootFolderRow(props) {
   );
 }
 
-ImportSeriesRootFolderRow.propTypes = {
+RootFolderRow.propTypes = {
   id: PropTypes.number.isRequired,
   path: PropTypes.string.isRequired,
   freeSpace: PropTypes.number.isRequired,
@@ -57,9 +57,9 @@ ImportSeriesRootFolderRow.propTypes = {
   onDeletePress: PropTypes.func.isRequired
 };
 
-ImportSeriesRootFolderRow.defaultProps = {
+RootFolderRow.defaultProps = {
   freeSpace: 0,
   unmappedFolders: []
 };
 
-export default ImportSeriesRootFolderRow;
+export default RootFolderRow;
diff --git a/frontend/src/RootFolder/RootFolderRowConnector.js b/frontend/src/RootFolder/RootFolderRowConnector.js
new file mode 100644
index 000000000..ab0848e87
--- /dev/null
+++ b/frontend/src/RootFolder/RootFolderRowConnector.js
@@ -0,0 +1,13 @@
+import { connect } from 'react-redux';
+import { deleteRootFolder } from 'Store/Actions/rootFolderActions';
+import RootFolderRow from './RootFolderRow';
+
+function createMapDispatchToProps(dispatch, props) {
+  return {
+    onDeletePress() {
+      dispatch(deleteRootFolder({ id: props.id }));
+    }
+  };
+}
+
+export default connect(null, createMapDispatchToProps)(RootFolderRow);
diff --git a/frontend/src/RootFolder/RootFolders.js b/frontend/src/RootFolder/RootFolders.js
new file mode 100644
index 000000000..57598dbb9
--- /dev/null
+++ b/frontend/src/RootFolder/RootFolders.js
@@ -0,0 +1,80 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import LoadingIndicator from 'Components/Loading/LoadingIndicator';
+import Table from 'Components/Table/Table';
+import TableBody from 'Components/Table/TableBody';
+import RootFolderRowConnector from './RootFolderRowConnector';
+
+const rootFolderColumns = [
+  {
+    name: 'path',
+    label: 'Path',
+    isVisible: true
+  },
+  {
+    name: 'freeSpace',
+    label: 'Free Space',
+    isVisible: true
+  },
+  {
+    name: 'unmappedFolders',
+    label: 'Unmapped Folders',
+    isVisible: true
+  },
+  {
+    name: 'actions',
+    isVisible: true
+  }
+];
+
+function RootFolders(props) {
+  const {
+    isFetching,
+    isPopulated,
+    error,
+    items
+  } = props;
+
+  if (isFetching && !isPopulated) {
+    return (
+      <LoadingIndicator />
+    );
+  }
+
+  if (!isFetching && !!error) {
+    return (
+      <div>Unable to load root folders</div>
+    );
+  }
+
+  return (
+    <Table
+      columns={rootFolderColumns}
+    >
+      <TableBody>
+        {
+          items.map((rootFolder) => {
+            return (
+              <RootFolderRowConnector
+                key={rootFolder.id}
+                id={rootFolder.id}
+                path={rootFolder.path}
+                freeSpace={rootFolder.freeSpace}
+                unmappedFolders={rootFolder.unmappedFolders}
+              />
+            );
+          })
+        }
+      </TableBody>
+    </Table>
+  );
+}
+
+RootFolders.propTypes = {
+  isFetching: PropTypes.bool.isRequired,
+  isPopulated: PropTypes.bool.isRequired,
+  error: PropTypes.object,
+  items: PropTypes.arrayOf(PropTypes.object).isRequired
+};
+
+export default RootFolders;
diff --git a/frontend/src/RootFolder/RootFoldersConnector.js b/frontend/src/RootFolder/RootFoldersConnector.js
new file mode 100644
index 000000000..39f140bcc
--- /dev/null
+++ b/frontend/src/RootFolder/RootFoldersConnector.js
@@ -0,0 +1,46 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import { fetchRootFolders } from 'Store/Actions/rootFolderActions';
+import RootFolders from './RootFolders';
+
+function createMapStateToProps() {
+  return createSelector(
+    (state) => state.rootFolders,
+    (rootFolders) => {
+      return rootFolders;
+    }
+  );
+}
+
+const mapDispatchToProps = {
+  dispatchFetchRootFolders: fetchRootFolders
+};
+
+class RootFoldersConnector extends Component {
+
+  //
+  // Lifecycle
+
+  componentDidMount() {
+    this.props.dispatchFetchRootFolders();
+  }
+
+  //
+  // Render
+
+  render() {
+    return (
+      <RootFolders
+        {...this.props}
+      />
+    );
+  }
+}
+
+RootFoldersConnector.propTypes = {
+  dispatchFetchRootFolders: PropTypes.func.isRequired
+};
+
+export default connect(createMapStateToProps, mapDispatchToProps)(RootFoldersConnector);
diff --git a/frontend/src/Settings/MediaManagement/MediaManagement.js b/frontend/src/Settings/MediaManagement/MediaManagement.js
index 9e01323c7..5ea69c105 100644
--- a/frontend/src/Settings/MediaManagement/MediaManagement.js
+++ b/frontend/src/Settings/MediaManagement/MediaManagement.js
@@ -10,6 +10,7 @@ import Form from 'Components/Form/Form';
 import FormGroup from 'Components/Form/FormGroup';
 import FormLabel from 'Components/Form/FormLabel';
 import FormInputGroup from 'Components/Form/FormInputGroup';
+import RootFoldersConnector from 'RootFolder/RootFoldersConnector';
 import NamingConnector from './Naming/NamingConnector';
 
 const rescanAfterRefreshOptions = [
@@ -51,14 +52,20 @@ class MediaManagement extends Component {
         />
 
         <PageContentBodyConnector>
+          <NamingConnector />
+
           {
             isFetching &&
-              <LoadingIndicator />
+              <FieldSet legend="Naming Settings">
+                <LoadingIndicator />
+              </FieldSet>
           }
 
           {
             !isFetching && error &&
+            <FieldSet legend="Naming Settings">
               <div>Unable to load Media Management settings</div>
+            </FieldSet>
           }
 
           {
@@ -67,8 +74,6 @@ class MediaManagement extends Component {
                 id="mediaManagementSettings"
                 {...otherProps}
               >
-                <NamingConnector />
-
                 {
                   advancedSettings &&
                     <FieldSet legend="Folders">
@@ -363,6 +368,10 @@ class MediaManagement extends Component {
                 }
               </Form>
           }
+
+          <FieldSet legend="Root Folders">
+            <RootFoldersConnector />
+          </FieldSet>
         </PageContentBodyConnector>
       </PageContent>
     );
diff --git a/frontend/src/Settings/Settings.js b/frontend/src/Settings/Settings.js
index 5222ec415..ea2e5d7a4 100644
--- a/frontend/src/Settings/Settings.js
+++ b/frontend/src/Settings/Settings.js
@@ -21,7 +21,7 @@ function Settings() {
         </Link>
 
         <div className={styles.summary}>
-          Naming and file management settings
+          Naming, file management settings and root folders
         </div>
 
         <Link