diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml
index 421117ef9..3c3ccd6a5 100644
--- a/astrid/res/values/keys.xml
+++ b/astrid/res/values/keys.xml
@@ -281,6 +281,8 @@
   
   <string name="p_use_date_shortcuts">p_use_date_shortcuts</string>
   
+  <string name="p_hide_plus_button">p_hide_plus_button</string>
+  
   <!-- Configurations -->
   <string name="p_configurations">p_configurations</string>
   <string name="p_config_default">p_config_default</string>
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index b441eee0f..d3d13f842 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -746,6 +746,9 @@
   <!-- Preference: simple input box style -->
   <string name="EPr_show_quickadd_controls">Advanced quickadd controls</string>
 
+  <!-- Preference: don't show plus button until input present -->
+  <string name="EPr_hide_plus_button">Hide plus button</string>
+
   <!-- Preference: menu items -->
   <string name="EPr_menu_items">Menu items</string>
 
diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml
index b4ddd2be6..7d1b2b01c 100644
--- a/astrid/res/xml/preferences.xml
+++ b/astrid/res/xml/preferences.xml
@@ -156,6 +156,11 @@
 	            android:title="@string/EPr_show_quickadd_controls"
 	            android:defaultValue="true" />
 	        
+	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
+	                android:key="@string/p_hide_plus_button"
+	                android:title="@string/EPr_hide_plus_button"
+	                android:defaultValue="false"/>
+	        
 	        <CheckBoxPreference
 	            android:key="@string/p_swipe_lists_enabled"
 	            android:title="@string/EPr_swipe_lists_performance_title" 
diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
index a634d2c42..b08cf58cd 100644
--- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
+++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
@@ -646,6 +646,8 @@ public class EditPreferences extends TodorooPreferenceActivity {
 
         findPreference(getString(R.string.p_fontSize)).setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED));
 
+        findPreference(getString(R.string.p_hide_plus_button)).setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED));
+
         findPreference(getString(R.string.p_config_default)).setOnPreferenceClickListener(
                 new SetDefaultsClickListener(new AstridDefaultPreferenceSpec(), R.string.EPr_config_dialog_default_id, StatisticsConstants.PREFS_RESET_DEFAULT));
 
diff --git a/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java b/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java
index 0769bd76e..23685d595 100644
--- a/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java
+++ b/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java
@@ -137,6 +137,9 @@ public class ABTests {
     }
 
     private void initialize() {
-        //
+        addTest(AB_HIDE_PLUS_BUTTON, new int[] { 1, 1 }, new int[] { 1, 0 },
+                new String[] { "plus-button-shown", "plus-button-hidden" }, true); //$NON-NLS-1$ //$NON-NLS-2$
     }
+
+    public static final String AB_HIDE_PLUS_BUTTON = "android-hide-plus-button"; //$NON-NLS-1$
 }
diff --git a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
index 3a0ab3b95..3818e2456 100644
--- a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
+++ b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
@@ -143,12 +143,16 @@ public class QuickAddBar extends LinearLayout {
         quickAddBox.addTextChangedListener(new TextWatcher() {
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
-                final boolean visible = !TextUtils.isEmpty(s) && quickAddBox.hasFocus();
+                final boolean controlsVisible = !TextUtils.isEmpty(s) && quickAddBox.hasFocus();
                 final boolean showControls = Preferences.getBoolean(R.string.p_show_quickadd_controls, true);
+
+                final boolean plusVisible = !TextUtils.isEmpty(s);
+                final boolean hidePlus = Preferences.getBoolean(R.string.p_hide_plus_button, false);
                 quickAddControlsContainer.postDelayed(new Runnable() {
                     @Override
                     public void run() {
-                        quickAddControlsContainer.setVisibility((showControls && visible) ? View.VISIBLE : View.GONE);
+                        quickAddButton.setVisibility((plusVisible || !hidePlus) ? View.VISIBLE : View.GONE);
+                        quickAddControlsContainer.setVisibility((showControls && controlsVisible) ? View.VISIBLE : View.GONE);
                     }
                 }, 10);
             }
@@ -165,6 +169,7 @@ public class QuickAddBar extends LinearLayout {
 
         quickAddButton = ((ImageButton) findViewById(
                 R.id.quickAddButton));
+        quickAddButton.setVisibility(Preferences.getBoolean(R.string.p_hide_plus_button, false) ? View.GONE : View.VISIBLE);
 
         // set listener for quick add button
         quickAddButton.setOnClickListener(new OnClickListener() {
diff --git a/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java b/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
index f61f6e83a..9a8818c4a 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
@@ -12,6 +12,8 @@ import com.todoroo.astrid.activity.BeastModePreferences;
 import com.todoroo.astrid.core.SortHelper;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.service.ThemeService;
+import com.todoroo.astrid.service.abtesting.ABChooser;
+import com.todoroo.astrid.service.abtesting.ABTests;
 
 public class AstridDefaultPreferenceSpec extends AstridPreferenceSpec {
 
@@ -132,6 +134,8 @@ public class AstridDefaultPreferenceSpec extends AstridPreferenceSpec {
 
         setPreference(prefs, editor, r, R.string.p_save_and_cancel, false, ifUnset);
 
+        setPreference(prefs, editor, r, R.string.p_hide_plus_button, ABChooser.readChoiceForTest(ABTests.AB_HIDE_PLUS_BUTTON) > 0, ifUnset);
+
         extras.setExtras(context, prefs, editor, r, ifUnset);
 
         editor.commit();
diff --git a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
index f035212d4..21bb285d6 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
@@ -12,6 +12,8 @@ import com.todoroo.astrid.activity.BeastModePreferences;
 import com.todoroo.astrid.core.SortHelper;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.service.ThemeService;
+import com.todoroo.astrid.service.abtesting.ABChooser;
+import com.todoroo.astrid.service.abtesting.ABTests;
 import com.todoroo.astrid.utility.AstridDefaultPreferenceSpec.PreferenceExtras;
 
 public class AstridLitePreferenceSpec extends AstridPreferenceSpec {
@@ -119,6 +121,8 @@ public class AstridLitePreferenceSpec extends AstridPreferenceSpec {
         setPreference(prefs, editor, r, R.string.p_use_date_shortcuts, false, ifUnset);
 
         setPreference(prefs, editor, r, R.string.p_save_and_cancel, false, ifUnset);
+        
+        setPreference(prefs, editor, r, R.string.p_hide_plus_button, ABChooser.readChoiceForTest(ABTests.AB_HIDE_PLUS_BUTTON) > 0, ifUnset);
 
         extras.setExtras(context, prefs, editor, r, ifUnset);