diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml
index 1d6cce648..4cbe808f9 100644
--- a/astrid/res/xml/preferences.xml
+++ b/astrid/res/xml/preferences.xml
@@ -84,6 +84,13 @@
 	        android:title="@string/EPr_force_phone_layout"
 	        android:key="@string/p_force_phone_layout"
 	        android:defaultValue="false"/>
+
+        <ListPreference
+	        android:key="@string/p_swipe_lists_performance_key"
+	        android:title="@string/EPr_swipe_lists_performance_title"
+	        android:entries="@array/EPr_swipe_lists_performance_mode"
+	        android:entryValues="@array/EPr_swipe_lists_performance_mode_values" 
+	        android:summary="@string/EPr_swipe_lists_performance_subtitle" />
         
         <CheckBoxPreference
 	        android:title="@string/EPr_show_featured_lists"
@@ -99,12 +106,6 @@
 	        android:key="@string/p_use_contact_picker"
 	        android:title="@string/EPr_use_contact_picker"/>
         
-        <ListPreference
-	        android:key="@string/p_swipe_lists_performance_key"
-	        android:title="@string/EPr_swipe_lists_performance_title"
-	        android:entries="@array/EPr_swipe_lists_performance_mode"
-	        android:entryValues="@array/EPr_swipe_lists_performance_mode_values" 
-	        android:summary="@string/EPr_swipe_lists_performance_subtitle" />
         
         <com.todoroo.astrid.ui.MultilineCheckboxPreference
             android:key="@string/p_voiceInputEnabled"
diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
index 0e8f7174c..e714da623 100644
--- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
+++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
@@ -206,7 +206,10 @@ public class EditPreferences extends TodorooPreferenceActivity {
         disablePremiumPrefs();
 
         if (!AndroidUtilities.isTabletSized(this)) {
-            screen.removePreference(screen.findPreference(getString(R.string.p_force_phone_layout)));
+            appearance.removePreference(screen.findPreference(getString(R.string.p_force_phone_layout)));
+        } else {
+            preference = screen.findPreference(getString(R.string.p_swipe_lists_performance_key));
+            preference.setEnabled(Preferences.getBoolean(R.string.p_force_phone_layout, false));
         }
 
         removeForbiddenPreferences(screen, r);
@@ -534,7 +537,14 @@ public class EditPreferences extends TodorooPreferenceActivity {
         else if (booleanPreference(preference, value, R.string.p_end_at_deadline,
                     R.string.EPr_cal_start_at_due_time, R.string.EPr_cal_end_at_due_time));
         else if (r.getString(R.string.p_force_phone_layout).equals(preference.getKey())) {
-             preference.setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED));
+             preference.setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED) {
+                 @Override
+                public boolean onPreferenceChange(Preference p, Object newValue) {
+                    Preference swipe = findPreference(getString(R.string.p_swipe_lists_performance_key));
+                    swipe.setEnabled((Boolean) newValue);
+                    return super.onPreferenceChange(p, newValue);
+                }
+             });
         } else if (r.getString(R.string.p_show_featured_lists_labs).equals(preference.getKey())) {
             preference.setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(SyncProviderPreferences.RESULT_CODE_SYNCHRONIZE));
         }