diff --git a/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java b/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
index 8c49f0617..a9a9153fe 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
@@ -295,6 +295,8 @@ public class PreferencesFragment extends PreferenceFragment
                     if (TextUtils.equals(Preferences.PREF_EXPERT, pref.getDependency())) {
                         pref.setVisible(isExpertMode);
                     }
+                }
+                if (changing) {
                     RecyclerView recyclerView = getListView();
                     recyclerView.smoothScrollToPosition(recyclerView.getAdapter().getItemCount() - 1);
                 }