diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppList.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppList.js
index fb2bf14a58..d06f4a26ab 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppList.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppList.js
@@ -60,7 +60,8 @@ class AppList extends React.Component {
             this.fetchData(0, limit, res => {
                 this.setState({
                     apps: res,
-                    loading: false
+                    loading: false,
+                    hasMore: true
                 });
             });
         }
@@ -139,6 +140,7 @@ class AppList extends React.Component {
         return (
             <div>
                 <InfiniteScroll
+                    key={this.props.deviceType}
                     initialLoad={false}
                     pageStart={0}
                     loadMore={this.handleInfiniteOnLoad}