diff --git a/frontend/src/components/CourtDrawingDialog.vue b/frontend/src/components/CourtDrawingDialog.vue
index 61375208..552216a3 100644
--- a/frontend/src/components/CourtDrawingDialog.vue
+++ b/frontend/src/components/CourtDrawingDialog.vue
@@ -16,7 +16,7 @@
     />
 
     <div v-if="showDiaryFields" class="diary-fields">
-      <label class="diary-field">
+      <label v-if="showDurationFields" class="diary-field">
         <span>{{ $t('courtDrawing.durationText') }}</span>
         <input
           type="text"
@@ -25,7 +25,7 @@
           @input="calculateDurationFromText"
         />
       </label>
-      <label class="diary-field">
+      <label v-if="showDurationFields" class="diary-field">
         <span>{{ $t('courtDrawing.durationMinutes') }}</span>
         <input type="number" min="0" :value="diaryFields.duration" readonly />
       </label>
@@ -88,6 +88,10 @@ export default {
       type: Boolean,
       default: false
     },
+    showDurationFields: {
+      type: Boolean,
+      default: false
+    },
     showGroupSelect: {
       type: Boolean,
       default: false
diff --git a/frontend/src/views/DiaryView.vue b/frontend/src/views/DiaryView.vue
index 3feff2bf..dd1be42f 100644
--- a/frontend/src/views/DiaryView.vue
+++ b/frontend/src/views/DiaryView.vue
@@ -735,6 +735,7 @@
             :initial-name="editingGroupActivity && editingGroupActivity.groupPredefinedActivity ? editingGroupActivity.groupPredefinedActivity.name : (editingGroupActivity && editingGroupActivity.activityItem ? editingGroupActivity.activityItem.activity : null)"
             :initial-description="editingGroupActivity && editingGroupActivity.groupPredefinedActivity ? editingGroupActivity.groupPredefinedActivity.description : null"
             :show-diary-fields="true"
+            :show-duration-fields="!addNewGroupActivity && (!editingGroupActivity || editingGroupActivity.isNormalActivity)"
             :show-group-select="addNewGroupActivity && !editingGroupActivity"
             :groups="groups"
             :initial-duration="editingGroupActivity && editingGroupActivity.groupPredefinedActivity ? editingGroupActivity.groupPredefinedActivity.duration : newPlanItem.duration"