diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Base/BaseLayout.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Base/BaseLayout.js
index 242965cce55..cc63ca13114 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Base/BaseLayout.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Base/BaseLayout.js
@@ -161,6 +161,6 @@ class BaseLayout extends Component {
 
 BaseLayout.propTypes = {
     children: PropTypes.element
-}
+};
 
 export default withRouter(BaseLayout);
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTable.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTable.js
index 4d32077d566..0c558b8f8d3 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTable.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTable.js
@@ -88,7 +88,8 @@ class DataTable extends Component {
                              adjustForCheckbox={ false }>
                     <TableRow>
                         {headers.map((header) => {
-                                return (<DataTableHeader style={{display: 'flex'}} key={header.id} header={header}/>)
+                                return (<DataTableHeader key={header.data_id}
+                                                         style={{display: 'flex'}} header={header}/>)
                             }
                         )}
                     </TableRow>
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTableHeader.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTableHeader.js
index f9e793f6cf2..2f6285a8dda 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTableHeader.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTableHeader.js
@@ -61,7 +61,7 @@ class DataTableHeader extends Component {
         }
 
         return (
-            <TableHeaderColumn style={{paddingLeft: '0px'}} key={this.props.header.id}>
+            <TableHeaderColumn key={this.props.header.id} style={{paddingLeft: '0px'}} >
                 {headerCell}
             </TableHeaderColumn>
         );
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTableRow.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTableRow.js
index fc6f638034d..6a2a0d1e809 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTableRow.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/UIComponents/DataTableRow.js
@@ -47,13 +47,13 @@ class DataTableRow extends Component {
     render() {
         const {dataItem} = this.state;
         return (
-                <TableRow onClick={this._handleClick.bind(this)} >
+                <TableRow key={this.props.key} onClick={this._handleClick.bind(this)} >
                     {Object.keys(dataItem).map((key) => {
                         if (key !== 'id') {
                             return <TableRowColumn style={{alignItems: 'center'}}
                                                    key={key}>{dataItem[key]}</TableRowColumn>
                         } else {
-                            return <TableRowColumn/>
+                            return <TableRowColumn key={key}/>
                         }
 
                     } )}