diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
index d2a14c495..a2f30c167 100644
--- a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@@ -273,7 +273,7 @@ public class TaskListFragment extends InjectingListFragment implements OnSortSel
         parent.findViewById(R.id.fab).setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (ActivityPreferences.isTabletSized(context)) {
+                if (getResources().getBoolean(R.bool.two_pane_layout)) {
                     Task task = quickAddBar.quickAddTask();
                     onTaskListItemClicked(task.getId());
                 } else {
diff --git a/src/main/java/com/todoroo/astrid/widget/TasksWidget.java b/src/main/java/com/todoroo/astrid/widget/TasksWidget.java
index f6775f3c8..ff43146f4 100644
--- a/src/main/java/com/todoroo/astrid/widget/TasksWidget.java
+++ b/src/main/java/com/todoroo/astrid/widget/TasksWidget.java
@@ -52,7 +52,7 @@ public class TasksWidget extends InjectingAppWidgetProvider {
                 broadcaster.toggleCompletedState(intent.getLongExtra(TaskEditFragment.TOKEN_ID, 0));
                 break;
             case EDIT_TASK:
-                if(ActivityPreferences.isTabletSized(context)) {
+                if (context.getResources().getBoolean(R.bool.two_pane_layout)) {
                     intent.setClass(context, TaskListActivity.class);
                 } else {
                     intent.setClass(context, TaskEditActivity.class);
diff --git a/src/main/java/org/tasks/intents/TaskIntents.java b/src/main/java/org/tasks/intents/TaskIntents.java
index 24aa2c6c1..d87148555 100644
--- a/src/main/java/org/tasks/intents/TaskIntents.java
+++ b/src/main/java/org/tasks/intents/TaskIntents.java
@@ -14,14 +14,14 @@ import com.todoroo.astrid.activity.TaskListFragment;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.api.FilterWithCustomIntent;
 
-import org.tasks.preferences.ActivityPreferences;
+import org.tasks.R;
 
 public class TaskIntents {
 
     public static Intent getNewTaskIntent(Context context, Filter filter) {
         Intent intent;
-        boolean tablet = ActivityPreferences.isTabletSized(context);
-        if (tablet) {
+        boolean twoPaneLayout = context.getResources().getBoolean(R.bool.two_pane_layout);
+        if (twoPaneLayout) {
             intent = new Intent(context, TaskListActivity.class);
             intent.putExtra(TaskListActivity.OPEN_TASK, 0L);
         } else {
@@ -36,7 +36,7 @@ public class TaskIntents {
                 intent.putExtra(TaskEditFragment.TOKEN_VALUES, values);
                 intent.setAction("E" + values);
             }
-            if (tablet) {
+            if (twoPaneLayout) {
                 if (filter instanceof FilterWithCustomIntent) {
                     Bundle customExtras = ((FilterWithCustomIntent) filter).customExtras;
                     intent.putExtras(customExtras);
@@ -49,8 +49,8 @@ public class TaskIntents {
     }
 
     public static PendingIntent getEditTaskPendingIntent(Context context, final Filter filter, final long taskId) {
-        boolean tablet = ActivityPreferences.isTabletSized(context);
-        if (tablet) {
+        boolean twoPaneLayout = context.getResources().getBoolean(R.bool.two_pane_layout);
+        if (twoPaneLayout) {
             Intent intent = new Intent(context, TaskListActivity.class) {{
                 putExtra(TaskListActivity.OPEN_TASK, taskId);
                 if (filter != null && filter instanceof FilterWithCustomIntent) {
diff --git a/src/main/java/org/tasks/widget/WidgetHelper.java b/src/main/java/org/tasks/widget/WidgetHelper.java
index d62d874ca..586418bed 100644
--- a/src/main/java/org/tasks/widget/WidgetHelper.java
+++ b/src/main/java/org/tasks/widget/WidgetHelper.java
@@ -122,7 +122,7 @@ public class WidgetHelper {
 
     private PendingIntent getEditTaskIntent(Context context, Filter filter, int widgetId) {
         Intent intent = new Intent(context, TasksWidget.class);
-        if (ActivityPreferences.isTabletSized(context)) {
+        if (context.getResources().getBoolean(R.bool.two_pane_layout)) {
             if (filter != null && filter instanceof FilterWithCustomIntent) {
                 Bundle customExtras = ((FilterWithCustomIntent) filter).customExtras;
                 intent.putExtras(customExtras);
diff --git a/src/main/res/values-w820dp/bools.xml b/src/main/res/values-w820dp/bools.xml
new file mode 100644
index 000000000..82ac1f05c
--- /dev/null
+++ b/src/main/res/values-w820dp/bools.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="two_pane_layout">true</bool>
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values/bools.xml b/src/main/res/values/bools.xml
index 9f6208bd1..d501f82a1 100644
--- a/src/main/res/values/bools.xml
+++ b/src/main/res/values/bools.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <bool name="two_pane_layout">false</bool>
     <bool name="at_most_honeycomb">true</bool>
     <bool name="at_least_honeycomb_mr1">false</bool>
     <bool name="billing_enabled">false</bool>