diff --git a/app/src/main/java/de/tadris/fitness/activity/ListWorkoutsActivity.java b/app/src/main/java/de/tadris/fitness/activity/ListWorkoutsActivity.java
index 4e0703d..207c7ad 100644
--- a/app/src/main/java/de/tadris/fitness/activity/ListWorkoutsActivity.java
+++ b/app/src/main/java/de/tadris/fitness/activity/ListWorkoutsActivity.java
@@ -114,7 +114,7 @@ public class ListWorkoutsActivity extends Activity implements WorkoutAdapter.Wor
     }
 
     @Override
-    public void onItemClick(Workout workout) {
+    public void onItemClick(int pos, Workout workout) {
         ShowWorkoutActivity.selectedWorkout= workout;
         startActivity(new Intent(this, ShowWorkoutActivity.class));
     }
diff --git a/app/src/main/java/de/tadris/fitness/activity/ShowWorkoutActivity.java b/app/src/main/java/de/tadris/fitness/activity/ShowWorkoutActivity.java
index 9edc6cd..02cdb4a 100644
--- a/app/src/main/java/de/tadris/fitness/activity/ShowWorkoutActivity.java
+++ b/app/src/main/java/de/tadris/fitness/activity/ShowWorkoutActivity.java
@@ -56,6 +56,7 @@ import oauth.signpost.OAuthConsumer;
 
 public class ShowWorkoutActivity extends WorkoutActivity implements DialogUtils.WorkoutDeleter {
 
+    TextView commentView;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -68,10 +69,8 @@ public class ShowWorkoutActivity extends WorkoutActivity implements DialogUtils.
 
         initAfterContent();
 
-        addText(getString(R.string.comment) + ": " + workout.comment).setOnClickListener(v -> {
-            TextView textView= (TextView)v;
-            openEditCommentDialog(textView);
-        });
+        commentView = addText(getString(R.string.comment) + ": " + workout.comment);
+        commentView.setOnClickListener(v -> openEditCommentDialog());
 
         addTitle(getString(R.string.workoutTime));
         addKeyValue(getString(R.string.workoutDate), getDate());
@@ -120,13 +119,13 @@ public class ShowWorkoutActivity extends WorkoutActivity implements DialogUtils.
     }
 
 
-    private void openEditCommentDialog(final TextView change) {
+    private void openEditCommentDialog() {
         final EditText editText= new EditText(this);
         editText.setText(workout.comment);
         editText.setSingleLine(true);
         new AlertDialog.Builder(this)
                 .setTitle(R.string.enterComment)
-                .setPositiveButton(R.string.okay, (dialog, which) -> changeComment(editText.getText().toString(), change))
+                .setPositiveButton(R.string.okay, (dialog, which) -> changeComment(editText.getText().toString(), commentView))
                 .setView(editText).create().show();
     }
 
@@ -287,6 +286,9 @@ public class ShowWorkoutActivity extends WorkoutActivity implements DialogUtils.
             case R.id.actionUploadOSM:
                 prepareUpload();
                 return true;
+            case R.id.actionEditComment:
+                openEditCommentDialog();
+                return true;
         }
         return super.onOptionsItemSelected(item);
     }
diff --git a/app/src/main/java/de/tadris/fitness/view/WorkoutAdapter.java b/app/src/main/java/de/tadris/fitness/view/WorkoutAdapter.java
index eec3a80..33152c9 100644
--- a/app/src/main/java/de/tadris/fitness/view/WorkoutAdapter.java
+++ b/app/src/main/java/de/tadris/fitness/view/WorkoutAdapter.java
@@ -90,7 +90,7 @@ public class WorkoutAdapter extends RecyclerView.Adapter<WorkoutAdapter.WorkoutV
         }
         holder.lengthText.setText(UnitUtils.getDistance(workout.length));
         holder.timeText.setText(UnitUtils.getHourMinuteTime(workout.duration));
-        holder.root.setOnClickListener(v -> listener.onItemClick(workout));
+        holder.root.setOnClickListener(v -> listener.onItemClick(position, workout));
         holder.root.setOnLongClickListener(v -> {
             listener.onItemLongClick(position, workout);
             return true;
@@ -104,7 +104,7 @@ public class WorkoutAdapter extends RecyclerView.Adapter<WorkoutAdapter.WorkoutV
     }
 
     public interface WorkoutAdapterListener{
-        void onItemClick(Workout workout);
+        void onItemClick(int pos, Workout workout);
         void onItemLongClick(int pos, Workout workout);
     }
 
diff --git a/app/src/main/res/menu/show_workout_menu.xml b/app/src/main/res/menu/show_workout_menu.xml
index 6cef614..12af1db 100644
--- a/app/src/main/res/menu/show_workout_menu.xml
+++ b/app/src/main/res/menu/show_workout_menu.xml
@@ -19,6 +19,9 @@
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <item
+        android:id="@+id/actionEditComment"
+        android:title="@string/action_edit_comment" />
     <item
         android:id="@+id/actionExportGpx"
         android:title="@string/exportAsGpxFile" />
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 43b4d61..9222344 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -123,4 +123,5 @@
     <string name="timeMinutePlural">Minuten</string>
     <string name="timeMinuteSingular">Minute</string>
     <string name="voiceAnnouncementsTitle">Sprachansagen</string>
+    <string name="action_edit_comment">Kommentar bearbeiten</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b09b1e2..ee0890c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -148,4 +148,5 @@
     <string name="trackVisibilityPref">Track Visibility</string>
     <string name="description">Description</string>
     <string name="ttsNotAvailable">TextToSpeech is not available</string>
+    <string name="action_edit_comment">Edit Comment</string>
 </resources>