diff --git a/.eslintrc b/.eslintrc
index 8b6c336f..53e648e4 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,7 @@
 {
   "extends": ["standard", "eslint:recommended", "plugin:react/recommended"],
   "rules": {
+    "multiline-ternary": "off",
     "no-restricted-imports": [
       "error",
       {
diff --git a/src/components/MTableScrollbar/index.js b/src/components/MTableScrollbar/index.js
new file mode 100644
index 00000000..11726ca6
--- /dev/null
+++ b/src/components/MTableScrollbar/index.js
@@ -0,0 +1,36 @@
+import React from 'react';
+import { withStyles } from '@material-ui/core';
+import DoubleScrollbar from 'react-double-scrollbar';
+
+const style = () => ({
+  horizontalScrollContainer: {
+    '& ::-webkit-scrollbar': {
+      '-webkit-appearance': 'none'
+    },
+    '& ::-webkit-scrollbar:horizontal': {
+      height: 8
+    },
+    '& ::-webkit-scrollbar-thumb': {
+      borderRadius: 4,
+      border: '2px solid white',
+      backgroundColor: 'rgba(0, 0, 0, .3)'
+    }
+  }
+});
+
+const ScrollBar = withStyles(style)(({ double, children, classes }) => {
+  if (double) {
+    return <DoubleScrollbar>{children}</DoubleScrollbar>;
+  } else {
+    return (
+      <div
+        className={classes.horizontalScrollContainer}
+        style={{ overflowX: 'auto', position: 'relative' }}
+      >
+        {children}
+      </div>
+    );
+  }
+});
+
+export default ScrollBar;
diff --git a/src/components/index.js b/src/components/index.js
index 3e29114d..754c7360 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -5,6 +5,7 @@
 export { default as OverlayLoading } from './Overlay/OverlayLoading.js';
 export { default as OverlayError } from './Overlay/OverlayError.js';
 export { default as Container } from './Container';
+export { default as MTableScrollbar } from './MTableScrollbar';
 
 /** ---------------------------
  * Class based components
diff --git a/src/material-table.js b/src/material-table.js
index 0335ae27..cb2697ab 100644
--- a/src/material-table.js
+++ b/src/material-table.js
@@ -1,19 +1,20 @@
-/* eslint-disable no-unused-vars */
-import Table from '@material-ui/core/Table';
-import TableFooter from '@material-ui/core/TableFooter';
-import TableRow from '@material-ui/core/TableRow';
-import LinearProgress from '@material-ui/core/LinearProgress';
-import DoubleScrollbar from 'react-double-scrollbar';
-import * as React from 'react';
-import { MTablePagination, MTableSteppedPagination } from './components';
-import { DragDropContext, Droppable } from 'react-beautiful-dnd';
-import DataManager from './utils/data-manager';
+import React from 'react';
 import { debounce } from 'debounce';
 import equal from 'fast-deep-equal/react';
-import { withStyles } from '@material-ui/core';
+import {
+  Table,
+  TableFooter,
+  TableRow,
+  LinearProgress
+} from '@material-ui/core';
+import { DragDropContext, Droppable } from 'react-beautiful-dnd';
+import DataManager from './utils/data-manager';
 import * as CommonValues from './utils/common-values';
-
-/* eslint-enable no-unused-vars */
+import {
+  MTablePagination,
+  MTableSteppedPagination,
+  MTableScrollbar
+} from './components';
 
 export default class MaterialTable extends React.Component {
   dataManager = new DataManager();
@@ -1083,7 +1084,7 @@ export default class MaterialTable extends React.Component {
               onGroupRemoved={this.onGroupRemoved}
             />
           )}
-          <ScrollBar double={props.options.doubleHorizontalScroll}>
+          <MTableScrollbar double={props.options.doubleHorizontalScroll}>
             <Droppable droppableId="headers" direction="horizontal">
               {(provided, snapshot) => {
                 const table = this.renderTable(props);
@@ -1169,7 +1170,7 @@ export default class MaterialTable extends React.Component {
                 );
               }}
             </Droppable>
-          </ScrollBar>
+          </MTableScrollbar>
           {(this.state.isLoading || props.isLoading) &&
             props.options.loadingType === 'linear' && (
               <div style={{ position: 'relative', width: '100%' }}>
@@ -1232,37 +1233,6 @@ export default class MaterialTable extends React.Component {
   }
 }
 
-const style = () => ({
-  horizontalScrollContainer: {
-    '& ::-webkit-scrollbar': {
-      '-webkit-appearance': 'none'
-    },
-    '& ::-webkit-scrollbar:horizontal': {
-      height: 8
-    },
-    '& ::-webkit-scrollbar-thumb': {
-      borderRadius: 4,
-      border: '2px solid white',
-      backgroundColor: 'rgba(0, 0, 0, .3)'
-    }
-  }
-});
-
-const ScrollBar = withStyles(style)(({ double, children, classes }) => {
-  if (double) {
-    return <DoubleScrollbar>{children}</DoubleScrollbar>;
-  } else {
-    return (
-      <div
-        className={classes.horizontalScrollContainer}
-        style={{ overflowX: 'auto', position: 'relative' }}
-      >
-        {children}
-      </div>
-    );
-  }
-});
-
 function functionlessColumns(columns) {
   return columns.map((col) =>
     Object.entries(col).reduce((obj, [key, val]) => {