diff --git a/ttrssreader/src/main/java/org/ttrssreader/gui/CategoryActivity.java b/ttrssreader/src/main/java/org/ttrssreader/gui/CategoryActivity.java
index 4c66cb56..adf8961f 100755
--- a/ttrssreader/src/main/java/org/ttrssreader/gui/CategoryActivity.java
+++ b/ttrssreader/src/main/java/org/ttrssreader/gui/CategoryActivity.java
@@ -199,6 +199,12 @@ protected void doUpdate(boolean forceUpdate) {
 	public boolean onPrepareOptionsMenu(Menu menu) {
 		boolean ret = super.onPrepareOptionsMenu(menu);
 		menu.removeItem(R.id.Menu_MarkFeedRead);
+
+		if (!Controller.isTablet && selectedCategoryId != Integer.MIN_VALUE)
+			menu.removeItem(R.id.Menu_MarkAllRead);
+		if (selectedCategoryId == Integer.MIN_VALUE)
+			menu.removeItem(R.id.Menu_MarkFeedsRead);
+
 		return ret;
 	}
 
diff --git a/ttrssreader/src/main/java/org/ttrssreader/gui/fragments/CategoryListFragment.java b/ttrssreader/src/main/java/org/ttrssreader/gui/fragments/CategoryListFragment.java
index 925787c8..e51c263b 100755
--- a/ttrssreader/src/main/java/org/ttrssreader/gui/fragments/CategoryListFragment.java
+++ b/ttrssreader/src/main/java/org/ttrssreader/gui/fragments/CategoryListFragment.java
@@ -128,15 +128,6 @@ public boolean onContextItemSelected(android.view.MenuItem item) {
 		return false;
 	}
 
-	@Override
-	public void onPrepareOptionsMenu(Menu menu) {
-		if (!Controller.isTablet && selectedId != Integer.MIN_VALUE)
-			menu.removeItem(R.id.Menu_MarkAllRead);
-		if (selectedId == Integer.MIN_VALUE)
-			menu.removeItem(R.id.Menu_MarkFeedsRead);
-		super.onPrepareOptionsMenu(menu);
-	}
-
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		if (super.onOptionsItemSelected(item))
@@ -146,7 +137,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
 		if (activity == null)
 			return false;
 
-		boolean backAfterUpdate = Controller.getInstance().goBackAfterMarkAllRead();
+		boolean backAfterUpdate = Controller.getInstance().goBackAfterMarkAllRead() && !Controller.isTablet;
+
 		switch (item.getItemId()) {
 			case R.id.Menu_MarkAllRead: {
 				IUpdatable updateable = new ReadStateUpdater(ReadStateUpdater.TYPE.ALL_CATEGORIES);