diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SettingsActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SettingsActivity.java
index f6c20fd..a3153d4 100644
--- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SettingsActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SettingsActivity.java
@@ -213,6 +213,22 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
             addPreferencesFromResource(R.xml.pref_settings_general);
             setHasOptionsMenu(true);
 
+
+            PreferenceManager preferenceManager = getPreferenceManager();
+            SharedPreferences sp = preferenceManager.getSharedPreferences();
+
+
+            if (sp.getBoolean("pref_dark_mode_setting", false)) {
+                //TwoStatePreference x = (TwoStatePreference) findPreference("pref_dark_mode_automatically_by_system");
+                //x.setEnabled(false);
+                findPreference("pref_dark_mode_automatically_by_system").setEnabled(false);
+                findPreference("pref_dark_mode_automatically_by_battery").setEnabled(false);
+            } else {
+
+                findPreference("pref_dark_mode_automatically_by_system").setEnabled(!sp.getBoolean("pref_dark_mode_automatically_by_battery", false));
+                findPreference("pref_dark_mode_automatically_by_battery").setEnabled(!sp.getBoolean("pref_dark_mode_automatically_by_system", false));
+            }
+
             // Bind the summaries of EditText/List/Dialog/Ringtone preferences
             // to their values. When their values change, their summaries are
             // updated to reflect the new value, per the Android Design
@@ -222,7 +238,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
             //bindPreferenceSummaryToValue(findPreference("example_list"));
 
         }
-
         @Override
         public boolean onOptionsItemSelected(MenuItem item) {
             int id = item.getItemId();