diff --git a/src/views/appstore.html b/src/views/appstore.html
index 876ac174f..81eba3253 100644
--- a/src/views/appstore.html
+++ b/src/views/appstore.html
@@ -292,7 +292,7 @@
   </div>
 </div>
 
-<div ng-show="ready && validSubscription" class="ng-cloak appstore-grid" id="appstoreGrid">
+<div ng-show="ready && validSubscription" class="ng-cloak appstore-grid">
   <div class="row">
     <div class="col-md-12 text-center" ng-hide="apps.length">
       <br/>
diff --git a/src/views/appstore.js b/src/views/appstore.js
index 61a47646a..febfdd59f 100644
--- a/src/views/appstore.js
+++ b/src/views/appstore.js
@@ -463,7 +463,8 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
                 });
             }
 
-            if (document.getElementById('appstoreGrid')) document.getElementById('appstoreGrid').scrollIntoView();
+            // ensure we scroll to top
+            document.getElementById('ng-view').scrollTop = 0;
         });
     };