diff --git a/src/components/BrowserRow/BrowserRow.react.js b/src/components/BrowserRow/BrowserRow.react.js
index 35e2752647..61c310ea9a 100644
--- a/src/components/BrowserRow/BrowserRow.react.js
+++ b/src/components/BrowserRow/BrowserRow.react.js
@@ -33,6 +33,7 @@ export default class BrowserRow extends Component {
       row,
       rowValue,
       rowWidth,
+      headerWidth,
       selection,
       selectRow,
       setCopyableValue,
@@ -70,7 +71,8 @@ export default class BrowserRow extends Component {
       requiredCols = ['authData'];
     }
     return (
-      <div className={styles.tableRow} style={{ minWidth: rowWidth }} onMouseOver={() => onMouseOverRow(obj.id)}>
+      <div className={styles.tableRow} style={{ width: rowWidth }} onMouseOver={() => onMouseOverRow(obj.id)}>
+        <span className={styles.rowNumber} style={{width: headerWidth}}>{row + 1}</span>
         <span
           className={styles.checkCell}
           onMouseUp={onMouseUpRowCheckBox}
diff --git a/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.react.js b/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.react.js
index 1c6f8587e1..d2722d70ff 100644
--- a/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.react.js
+++ b/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.react.js
@@ -26,9 +26,13 @@ export default class DataBrowserHeaderBar extends React.Component {
       isDataLoaded,
       setSelectedObjectId,
       setCurrent,
+      headerWidth
     } = this.props;
     const elements = [
-      <div key="check" className={[styles.wrap, styles.check].join(' ')}>
+      <div key="rowNumber" className={styles.wrap} style={{ width: headerWidth, background: '#66637A' }}>
+        <div className={[styles.rowNumberColumn].join(' ')}>#</div>
+      </div>,
+      <div key="check" className={[styles.wrap, styles.check].join(' ')} style={{ width:  30 }}>
         {readonly ? null : (
           <input type="checkbox" checked={selected} onChange={e => selectAll(e.target.checked)} />
         )}
diff --git a/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.scss b/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.scss
index a69e8eba73..a60126b74c 100644
--- a/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.scss
+++ b/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.scss
@@ -53,7 +53,8 @@
   vertical-align: top;
   text-align: center;
   width: 30px;
-  background: rgb(114, 111, 133)
+  background: rgb(114, 111, 133);
+  padding-left: 30px;
 }
 
 .handle {
@@ -107,3 +108,14 @@
 
   }
 }
+
+.rowNumberColumn {
+  height: 30px;
+  line-height: 31px;
+  vertical-align: top;
+  text-align: center;
+  background-color: #66637A;
+  color: white;
+  font-size: 12px;
+  font-weight: normal;
+}
\ No newline at end of file
diff --git a/src/dashboard/Data/Browser/Browser.react.js b/src/dashboard/Data/Browser/Browser.react.js
index c61d216b29..0d0150a45e 100644
--- a/src/dashboard/Data/Browser/Browser.react.js
+++ b/src/dashboard/Data/Browser/Browser.react.js
@@ -2201,6 +2201,7 @@ class Browser extends DashboardView {
               errorAggregatedData={this.state.errorAggregatedData}
               appName={this.props.params.appId}
               limit={this.state.limit}
+              skip={this.state.skip}
             />
             <BrowserFooter
               skip={this.state.skip}
diff --git a/src/dashboard/Data/Browser/Browser.scss b/src/dashboard/Data/Browser/Browser.scss
index 705580ce9d..4d43114cfc 100644
--- a/src/dashboard/Data/Browser/Browser.scss
+++ b/src/dashboard/Data/Browser/Browser.scss
@@ -110,6 +110,16 @@ body:global(.expanded) {
   text-align: center;
 }
 
+.rowNumber {
+  display: inline-block;
+  height: 30px;
+  line-height: 31px;
+  vertical-align: top;
+  border-right: 1px solid #e3e3ea;
+  text-align: center;
+  border-bottom: 1px solid #e3e3ea;
+}
+
 .addRow {
   height: 30px;
   padding: 8px;
diff --git a/src/dashboard/Data/Browser/BrowserTable.react.js b/src/dashboard/Data/Browser/BrowserTable.react.js
index 125b299cc6..eba862b17e 100644
--- a/src/dashboard/Data/Browser/BrowserTable.react.js
+++ b/src/dashboard/Data/Browser/BrowserTable.react.js
@@ -35,6 +35,7 @@ export default class BrowserTable extends React.Component {
     this.tableRef = React.createRef();
     this.handleResize = this.handleResize.bind(this);
     this.updateMaxWidth = this.updateMaxWidth.bind(this);
+    this.headerWidth = 34;
   }
 
   componentWillReceiveProps(props) {
@@ -124,7 +125,13 @@ export default class BrowserTable extends React.Component {
       const rowWidth = this.props.order.reduce(
         (rowWidth, { visible, width }) => (visible ? rowWidth + width : rowWidth),
         this.props.onAddRow ? 210 : 0
-      );
+      ) + 30;
+
+      this.headerWidth = Math.max(
+        30,
+        Math.floor(Math.log10(this.props.data.length + this.props.skip)) * 10
+      ) + 4;
+
       let editCloneRows;
       if (this.props.editCloneRows) {
         editCloneRows = (
@@ -156,9 +163,10 @@ export default class BrowserTable extends React.Component {
                     onFilterChange={this.props.onFilterChange}
                     order={this.props.order}
                     readOnlyFields={READ_ONLY}
-                    row={index}
+                    row={index + this.props.skip}
                     rowValue={this.props.data[index]}
                     rowWidth={rowWidth}
+                    headerWidth={this.headerWidth}
                     selection={this.props.selection}
                     selectRow={this.props.selectRow}
                     setCurrent={this.props.setCurrent}
@@ -240,6 +248,7 @@ export default class BrowserTable extends React.Component {
               readOnlyFields={READ_ONLY}
               row={-1}
               rowWidth={rowWidth}
+              headerWidth={this.headerWidth}
               selection={this.props.selection}
               selectRow={this.props.selectRow}
               setCurrent={this.props.setCurrent}
@@ -329,9 +338,10 @@ export default class BrowserTable extends React.Component {
             callCloudFunction={this.props.callCloudFunction}
             order={this.props.order}
             readOnlyFields={READ_ONLY}
-            row={i}
+            row={i + this.props.skip}
             rowValue={this.props.data[i]}
             rowWidth={rowWidth}
+            headerWidth={this.headerWidth}
             selection={this.props.selection}
             selectRow={this.props.selectRow}
             setCurrent={this.props.setCurrent}
@@ -540,7 +550,7 @@ export default class BrowserTable extends React.Component {
         id="browser-table"
         style={{
           right: rightValue,
-          'overflow-x': this.props.isResizing ? 'hidden' : 'auto',
+          overflowX: this.props.isResizing ? 'hidden' : 'auto',
         }}
       >
         <DataBrowserHeaderBar
@@ -563,6 +573,7 @@ export default class BrowserTable extends React.Component {
           isDataLoaded={!!this.props.data}
           setSelectedObjectId={this.props.setSelectedObjectId}
           setCurrent={this.props.setCurrent}
+          headerWidth={this.headerWidth}
         />
         {table}
       </div>
diff --git a/src/dashboard/Data/Browser/BrowserToolbar.react.js b/src/dashboard/Data/Browser/BrowserToolbar.react.js
index cfd1c51083..28b892b595 100644
--- a/src/dashboard/Data/Browser/BrowserToolbar.react.js
+++ b/src/dashboard/Data/Browser/BrowserToolbar.react.js
@@ -434,6 +434,7 @@ const BrowserToolbar = ({
           }
           onClick={() => onExecuteScriptRows(selection)}
         />
+        <div/>
       </BrowserMenu>
       <div className={styles.toolbarSeparator} />
       {menu}