diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index e2899a62b..14b478412 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -80,9 +80,11 @@
 			android:key="expert" />
 		<CheckBoxPreference android:title="@string/root_installer"
 			android:defaultValue="false"
-			android:key="rootInstaller" />
+			android:key="rootInstaller"
+			android:dependency="expert" />
 		<CheckBoxPreference android:title="@string/system_installer"
 			android:defaultValue="false"
-			android:key="systemInstaller" />
+			android:key="systemInstaller"
+			android:dependency="expert" />
 	</PreferenceCategory>
 </PreferenceScreen>
diff --git a/src/org/fdroid/fdroid/views/fragments/PreferenceFragment.java b/src/org/fdroid/fdroid/views/fragments/PreferenceFragment.java
index 3595a70b6..b029f437a 100644
--- a/src/org/fdroid/fdroid/views/fragments/PreferenceFragment.java
+++ b/src/org/fdroid/fdroid/views/fragments/PreferenceFragment.java
@@ -140,16 +140,6 @@ public class PreferenceFragment
         } else if (key.equals(Preferences.PREF_EXPERT)) {
             onoffSummary(key, R.string.expert_on,
                 R.string.expert_off);
-            CheckBoxPreference pref = (CheckBoxPreference) findPreference(key);
-            Preference rinst = findPreference(Preferences.PREF_ROOT_INSTALLER);
-            Preference sinst = findPreference(Preferences.PREF_SYSTEM_INSTALLER);
-            if (pref.isChecked()) {
-                rinst.setEnabled(true);
-                sinst.setEnabled(true);
-            } else {
-                rinst.setEnabled(false);
-                sinst.setEnabled(false);
-            }
 
         } else if (key.equals(Preferences.PREF_ROOT_INSTALLER)) {
             onoffSummary(key, R.string.root_installer_on,