diff --git a/app/src/main/java/io/lbry/browser/adapter/ClaimListAdapter.java b/app/src/main/java/io/lbry/browser/adapter/ClaimListAdapter.java
index 9696311..15651a8 100644
--- a/app/src/main/java/io/lbry/browser/adapter/ClaimListAdapter.java
+++ b/app/src/main/java/io/lbry/browser/adapter/ClaimListAdapter.java
@@ -327,7 +327,7 @@ public class ClaimListAdapter extends RecyclerView.Adapter<ClaimListAdapter.View
         }
 
         boolean isPending = item.getConfirmations() == 0;
-        boolean isSelected = isClaimSelected(item);
+        boolean isSelected = isClaimSelected(original);
         vh.itemView.setSelected(isSelected);
         vh.selectedOverlayView.setVisibility(isSelected ? View.VISIBLE : View.GONE);
         vh.itemView.setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/java/io/lbry/browser/ui/publish/PublishesFragment.java b/app/src/main/java/io/lbry/browser/ui/publish/PublishesFragment.java
index 14050b7..95ebd1d 100644
--- a/app/src/main/java/io/lbry/browser/ui/publish/PublishesFragment.java
+++ b/app/src/main/java/io/lbry/browser/ui/publish/PublishesFragment.java
@@ -239,7 +239,8 @@ public class PublishesFragment extends BaseFragment implements ActionMode.Callba
     @Override
     public boolean onPrepareActionMode(androidx.appcompat.view.ActionMode actionMode, Menu menu) {
         int selectionCount = adapter != null ? adapter.getSelectedCount() : 0;
-        menu.findItem(R.id.action_edit).setVisible(selectionCount == 1);
+        menu.findItem(R.id.action_edit).setVisible(selectionCount == 1 &&
+                Claim.TYPE_STREAM.equalsIgnoreCase(adapter.getSelectedItems().get(0).getValueType()));
         return true;
     }