diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
index 5a9a4edb0..72c6284b6 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -361,6 +361,9 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
                 overrideFinishAnim = activity.getIntent().getBooleanExtra(
                         OVERRIDE_FINISH_ANIM, true);
         }
+
+        if (activity instanceof TaskListActivity)
+            ((TaskListActivity) activity).setCommentsButtonVisibility(false);
     }
 
     private void instantiateEditNotes() {
@@ -989,16 +992,18 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
 
         // abandon editing and delete the newly created task if
         // no title was entered
+        Activity activity = getActivity();
         if (overrideFinishAnim) {
-            AndroidUtilities.callOverridePendingTransition(getActivity(),
+            AndroidUtilities.callOverridePendingTransition(activity,
                     R.anim.slide_right_in, R.anim.slide_right_out);
         }
 
-        if (getActivity() instanceof TaskListActivity) {
+        if (activity instanceof TaskListActivity) {
             if (title.getText().length() == 0 && isNewTask
                     && model != null && model.isSaved()) {
                 taskService.delete(model);
             }
+            ((TaskListActivity) activity).setCommentsButtonVisibility(true);
         }
     }
 
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 081096f6c..338825ebd 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -434,6 +434,10 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
         }
     }
 
+    public void setCommentsButtonVisibility(boolean visible) {
+        commentsButton.setVisibility(visible && filterModeSpec.showComments() && fragmentLayout != LAYOUT_TRIPLE ? View.VISIBLE : View.GONE);
+    }
+
     private void setListsDropdownSelected(boolean selected) {
         int oldTextColor = lists.getTextColors().getDefaultColor();
         int textStyle = (selected ? R.style.TextAppearance_ActionBar_ListsHeader_Selected :
diff --git a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
index a0c940e7f..148d89dab 100644
--- a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
+++ b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
@@ -117,7 +117,7 @@ public class MainMenuPopover extends FragmentPopover implements InterceptTouchLi
                 ThemeService.getDrawable(R.drawable.icn_menu_lists, themeFlags),
                 MAIN_MENU_ITEM_LISTS, null, topFixed); // Lists item
 
-        if (Preferences.getBoolean(R.string.p_show_friends_view, false))
+        if (Preferences.getBoolean(R.string.p_show_friends_view, false) && Preferences.getBoolean(R.string.p_show_menu_friends, true))
             addMenuItem(R.string.TLA_menu_friends,
                     ThemeService.getDrawable(R.drawable.icn_menu_friends, themeFlags),
                     MAIN_MENU_ITEM_FRIENDS, null, topFixed);