diff --git a/aleksis/apps/alsijil/frontend/components/coursebook/documentation/Documentation.vue b/aleksis/apps/alsijil/frontend/components/coursebook/documentation/Documentation.vue
index 2bcc1b4ff52870897bd86aa81ea6cb127f0b505c..15f4b371783f02a3efc95f7099e52e27430f0331 100644
--- a/aleksis/apps/alsijil/frontend/components/coursebook/documentation/Documentation.vue
+++ b/aleksis/apps/alsijil/frontend/components/coursebook/documentation/Documentation.vue
@@ -15,7 +15,12 @@
         'pa-2': compact,
       }"
     >
-      <lesson-information v-if="compact" v-bind="documentationPartProps" />
+      <lesson-information
+        v-if="compact"
+        v-bind="documentationPartProps"
+        :is-create="false"
+        :gql-patch-mutation="documentationsMutation"
+      />
       <lesson-summary
         ref="summary"
         v-bind="{ ...$attrs, ...documentationPartProps }"
diff --git a/aleksis/apps/alsijil/frontend/components/coursebook/documentation/LessonInformation.vue b/aleksis/apps/alsijil/frontend/components/coursebook/documentation/LessonInformation.vue
index c008ca893df909f3bd68028fb80af154fbf61a0e..cbac892d52b48d9f7d1236bf754974e11b34f258 100644
--- a/aleksis/apps/alsijil/frontend/components/coursebook/documentation/LessonInformation.vue
+++ b/aleksis/apps/alsijil/frontend/components/coursebook/documentation/LessonInformation.vue
@@ -2,7 +2,7 @@
 import DocumentationStatus from "./DocumentationStatus.vue";
 import PersonChip from "aleksis.core/components/person/PersonChip.vue";
 import SubjectChip from "aleksis.apps.cursus/components/SubjectChip.vue";
-import SubjectField from "aleksis.apps.cursus/components/SubjectField.vue";
+import SubjectChipSelectField from "aleksis.apps.cursus/components/SubjectChipSelectField.vue";
 </script>
 
 <template>
@@ -39,29 +39,21 @@ import SubjectField from "aleksis.apps.cursus/components/SubjectField.vue";
         'justify-start': !largeGrid,
       }"
     >
-      <v-slide-x-transition>
-        <subject-chip
-          v-if="documentation.subject && !subjectField"
-          :subject="documentation.subject"
-          :append-icon="compact ? '' : '$edit'"
-          :disabled="loading"
-          v-bind="compact ? dialogActivator.attrs : {}"
-          v-on="
-            compact
-              ? dialogActivator.on
-              : { click: () => (subjectField = true) }
-          "
-        />
-        <subject-field
-          v-else-if="documentation.canEdit"
+      <template v-if="documentation.subject">
+        <subject-chip-select-field
+          v-if="documentation.canEdit"
           :value="documentation.subject"
           :enable-create="false"
-          dense
-          filled
-          hide-details
+          :disabled="loading"
+          :loading="loading"
           @input="editSubject"
         />
-      </v-slide-x-transition>
+        <subject-chip
+          v-else
+          :subject="documentation.subject"
+          :disabled="loading"
+        />
+      </template>
       <subject-chip
         v-if="
           documentation?.amends?.amends?.subject &&
@@ -117,17 +109,11 @@ export default {
     documentationCacheUpdateMixin,
     documentationPartMixin,
   ],
-  data() {
-    return {
-      subjectField: false,
-    };
-  },
   methods: {
     toDateTime(dateString) {
       return DateTime.fromISO(dateString);
     },
     editSubject(subject) {
-      this.subjectField = false;
       this.createOrPatch([
         {
           id: this.documentation.id,