1 files changed, 6 insertions, 1 deletions
diff --git a/js/build/app.js b/js/build/app.js
index 20330a0b8..31432ddf2 100644
--- a/js/build/app.js
+++ b/js/build/app.js
@@ -2343,7 +2343,12 @@ app.service('SettingsResource', ["$http", "BASE_URL", function ($http, BASE_URL)
         items.each(function (index, item) {
             item = $(item);
 
-            if (item.position().top > 1) {
+            // special treatment for items that have expand enabled:
+            // if you click next and the first item has not been expaned and
+            // is on the top, it should be expanded instead of the next one
+            if ((item.position().top === 0 && expandItemInCompact &&
+                 !item.hasClass('open')) ||
+                item.position().top > 1) {
                 scrollToItem(scrollArea, item, expandItemInCompact);
 
                 jumped = true;