diff --git a/api/src/com/todoroo/andlib/utility/AndroidUtilities.java b/api/src/com/todoroo/andlib/utility/AndroidUtilities.java
index 5339eebe1..6332f589a 100644
--- a/api/src/com/todoroo/andlib/utility/AndroidUtilities.java
+++ b/api/src/com/todoroo/andlib/utility/AndroidUtilities.java
@@ -834,12 +834,15 @@ public class AndroidUtilities {
             float effectiveWidth = Math.min(width, height);
             float effectiveHeight = Math.max(width, height);
 
-            return (effectiveWidth >= 550 && effectiveHeight >= 800);
+            return (effectiveWidth >= MIN_TABLET_WIDTH && effectiveHeight >= MIN_TABLET_HEIGHT);
         } else {
             return false;
         }
     }
 
+    public static final int MIN_TABLET_WIDTH = 550;
+    public static final int MIN_TABLET_HEIGHT = 800;
+
     /**
      * Wraps a call to Activity.unregisterReceiver in a try/catch block to prevent
      * exceptions being thrown if receiver was never registered with that activity
diff --git a/astrid/src/com/todoroo/astrid/ui/PopupControlSet.java b/astrid/src/com/todoroo/astrid/ui/PopupControlSet.java
index 2e5a2c4e8..bf071bcc7 100644
--- a/astrid/src/com/todoroo/astrid/ui/PopupControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/PopupControlSet.java
@@ -8,7 +8,6 @@ package com.todoroo.astrid.ui;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.DialogInterface;
-import android.content.res.Configuration;
 import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -100,12 +99,15 @@ public abstract class PopupControlSet extends TaskEditControlSet {
         LayoutParams params = dialog.getWindow().getAttributes();
         params.width = LayoutParams.FILL_PARENT;
         params.height = LayoutParams.WRAP_CONTENT;
-        Configuration config = activity.getResources().getConfiguration();
-        int size = config.screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK;
-        if (AndroidUtilities.getSdkVersion() >= 9 && size == Configuration.SCREENLAYOUT_SIZE_XLARGE) {
+
+        if (AndroidUtilities.isTabletSized(activity)) {
             DisplayMetrics metrics = activity.getResources().getDisplayMetrics();
-            params.width = metrics.widthPixels / 2;
+            if ((metrics.widthPixels / metrics.density) >= AndroidUtilities.MIN_TABLET_HEIGHT)
+                params.width = (3 * metrics.widthPixels) / 5;
+            else if ((metrics.widthPixels / metrics.density) >= AndroidUtilities.MIN_TABLET_WIDTH)
+                params.width = (3 * metrics.widthPixels) / 4;
         }
+
         dialog.getWindow().setAttributes((android.view.WindowManager.LayoutParams) params);
 
         dialog.setOnCancelListener(cancelClickListener);