diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java
index 698507dc6..2d264ab86 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java
@@ -289,7 +289,15 @@ public class TagUpdatesFragment extends ListFragment {
             return;
 
         MenuItem item;
-        if(actFmPreferenceService.isLoggedIn()) {
+        boolean showCommentsRefresh = actFmPreferenceService.isLoggedIn();
+        if (showCommentsRefresh) {
+        Activity activity = getActivity();
+            if (activity instanceof TaskListActivity) {
+                TaskListActivity tla = (TaskListActivity) activity;
+                showCommentsRefresh = tla.getTaskEditFragment() == null;
+            }
+        }
+        if(showCommentsRefresh) {
             item = menu.add(Menu.NONE, MENU_REFRESH_ID, Menu.NONE,
                     R.string.ENA_refresh_comments);
             item.setIcon(R.drawable.icn_menu_refresh_dark);
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
index 2beb54c56..cf5d2a15a 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
@@ -428,8 +428,11 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
             return;
 
         boolean isTablet = AstridPreferences.useTabletLayout(activity);
-        if (activity instanceof TaskListActivity)
-            ((TaskListActivity) activity).getMainMenuPopover().clear();
+        TaskListActivity tla = null;
+        if (activity instanceof TaskListActivity) {
+            tla = (TaskListActivity) activity;
+            tla.getMainMenuPopover().clear();
+        }
 
         // --- sort
         if (allowResorting()) {
@@ -438,7 +441,8 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
         }
 
         // --- sync
-        addSyncRefreshMenuItem(menu, isTablet ? ThemeService.FLAG_INVERT : 0);
+        if (tla == null || tla.getTaskEditFragment() == null)
+            addSyncRefreshMenuItem(menu, isTablet ? ThemeService.FLAG_INVERT : 0);
 
         // --- new filter
         addMenuItem(menu, R.string.FLA_new_filter,