diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/FinishListAdapter.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/FinishListAdapter.java
index 991013784b0..9414247e6d7 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/FinishListAdapter.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/FinishListAdapter.java
@@ -170,18 +170,16 @@ public class FinishListAdapter extends BaseDraggableSwipeAdapter<FinishListAdapt
         public ItemViewHolder(View itemView) {
             super(itemView);
 
+            itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    CompetitorResultWithIdImpl item = mItems.get(getAdapterPosition());
+                    mParent.onItemEdit(item);
+                }
+            });
+
             container = ViewHelper.get(itemView, R.id.container);
             dragHandle = ViewHelper.get(itemView, R.id.drag_handle);
-            editItem = ViewHelper.get(itemView, R.id.edit_item);
-            if (editItem != null) {
-                editItem.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        CompetitorResultWithIdImpl item = mItems.get(getAdapterPosition());
-                        mParent.onItemEdit(item);
-                    }
-                });
-            }
             vesselId = ViewHelper.get(itemView, R.id.vessel_id);
             competitor = ViewHelper.get(itemView, R.id.competitor);
             warning = ViewHelper.get(itemView, R.id.warning_sign);