diff --git a/client/src/components/content-block-form/ContentElement.vue b/client/src/components/content-block-form/ContentElement.vue
index 50f7abfa..c462d1be 100644
--- a/client/src/components/content-block-form/ContentElement.vue
+++ b/client/src/components/content-block-form/ContentElement.vue
@@ -33,6 +33,7 @@
           @switch-to-document="switchToDocument"
           @assignment-change-title="changeAssignmentTitle"
           @assignment-change-assignment="changeAssignmentAssignment"
+          @assignment-change-solution="changeAssignmentSolution"
         />
       </div>
     </content-form-section>
@@ -254,6 +255,9 @@ export default {
     changeAssignmentAssignment(value) {
       this._updateProperty(value, 'assignment');
     },
+    changeAssignmentSolution(value) {
+      this._updateProperty(value, 'solution');
+    },
     changeType({ type, convertToList }, value) {
       let el = {
         type: type,
diff --git a/client/src/components/content-forms/AssignmentForm.vue b/client/src/components/content-forms/AssignmentForm.vue
index 8279c107..6ddf981c 100644
--- a/client/src/components/content-forms/AssignmentForm.vue
+++ b/client/src/components/content-forms/AssignmentForm.vue
@@ -8,10 +8,16 @@
     />
     <textarea
       :value="value.assignment"
-      class="assignment-form__exercise-text skillbox-textarea"
+      class="assignment-form__textarea skillbox-textarea"
       placeholder="Aufgabe erfassen..."
       @input="$emit('assignment-change-assignment', $event.target.value, index)"
     />
+    <textarea
+      :value="value.solution"
+      class="assignment-form__textarea skillbox-textarea"
+      placeholder="Lösung erfassen..."
+      @input="$emit('assignment-change-solution', $event.target.value, index)"
+    />
     <info-icon class="assignment-form__help-icon help-text__icon" />
     <p class="assignment-form__help-description help-text__description">
       Ein Eingabefeld für die Antwort wird automatisch hinzugefügt.
@@ -47,7 +53,7 @@ export default {
     grid-column: span 2;
   }
 
-  &__exercise-text {
+  &__textarea {
     width: $modal-input-width;
     grid-column: span 2;
   }