diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/presenter/IdentitiesPresenter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/presenter/IdentitiesPresenter.java
index 03873475b..de4cf3e1e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/presenter/IdentitiesPresenter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/presenter/IdentitiesPresenter.java
@@ -85,14 +85,9 @@ public class IdentitiesPresenter implements LoaderCallbacks<List<IdentityInfo>>
         });
         view.setIdentitiesAdapter(identitiesAdapter);
 
-        view.setAddLinkedIdButtonVisible(showLinkedIds);
+        view.setAddLinkedIdButtonVisible(showLinkedIds && isSecret);
 
-        view.setIdentitiesCardListener(new IdentitiesCardListener() {
-            @Override
-            public void onClickAddIdentity() {
-                addLinkedIdentity();
-            }
-        });
+        view.setIdentitiesCardListener(() -> addLinkedIdentity());
     }
 
     public void startLoader(LoaderManager loaderManager) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/view/IdentitiesCardView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/view/IdentitiesCardView.java
index ea3af35a8..26d8b5801 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/view/IdentitiesCardView.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/view/IdentitiesCardView.java
@@ -50,12 +50,9 @@ public class IdentitiesCardView extends CardView implements IdentitiesMvpView {
         vIdentities.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL_LIST, false));
 
         linkedIdsAddButton = view.findViewById(R.id.view_key_card_linked_ids_add);
-        linkedIdsAddButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (identitiesCardListener != null) {
-                    identitiesCardListener.onClickAddIdentity();
-                }
+        linkedIdsAddButton.setOnClickListener(v -> {
+            if (identitiesCardListener != null) {
+                identitiesCardListener.onClickAddIdentity();
             }
         });
     }