diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 0d180d2ff..1237db868 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -176,7 +176,7 @@ export default {
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
 				responsiveLayout: "collapse",
-				height: '250',
+				height: '200',
 				selectableRangeMode: 'click',
 				selectable: true,
 				index: 'notiz_id',
@@ -572,10 +572,9 @@ export default {
 				>
 			</core-filter-cmpt>
 			
-			<br>
 		
-			<form-form ref="formNotiz" @submit.prevent class="row pt-3">
-				<br><br>
+			<form-form ref="formNotiz" @submit.prevent class="row">
+
 				<div class="pt-2">
 					<div class="row mb-3">
 						<div class="col-sm-7">
@@ -708,9 +707,13 @@ export default {
 						<p class="small">{{notizData.lastupdate}}</p>
 					</div>
 				</div>
-				
-				<button v-if="notizData.statusNew"  type="button" class="btn btn-primary" @click="addNewNotiz()"> {{$p.t('studierendenantrag', 'btn_new')}}</button>
-				<button v-else type="button" class="btn btn-primary" @click="updateNotiz(notizData.notiz_id)"> {{$p.t('ui', 'speichern')}}</button>
+				<div class="row">
+					<div class="text-end">
+						<button v-if="notizData.statusNew"  type="button" class="btn btn-primary" @click="addNewNotiz()"> {{$p.t('studierendenantrag', 'btn_new')}}</button>
+						<button v-else type="button" class="btn btn-primary" @click="updateNotiz(notizData.notiz_id)"> {{$p.t('ui', 'speichern')}}</button>
+					</div>
+				</div>
+
 			</form-form>
 		</div>
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
index abe5d177d..a85ee77f5 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
@@ -184,6 +184,7 @@ export default {
 			this.currentAnrechnung_id = anrechnung_id;
 			this.loadAnrechnung(this.currentAnrechnung_id);
 			this.showNotizen = true;
+			this.$refs.anrechnungsnotizModal.show();
 		},
 		addNewAnrechnung(){
 			const dataToSend = {
@@ -304,36 +305,31 @@ export default {
 	},
 	template: `
 				<div class="stv-details-tab_exemptions h-100 pb-3">
-					<h5>{{$p.t('lehre', 'anrechnungen')}}</h5>
-					
-					<div v-if="showNotizen" class="border p-3 overflow-auto" style="height: 200px;">
-							<!-- <div class="justify-content-end pb-3">
-								<form-input
-									container-class="form-switch"
-									type="checkbox"
-									label="Notizen"
-									v-model="showNotizen"
-									@change="onSwitchHide"
-									>
-								</form-input>
-							</div> -->
-						<h6><strong>LV {{formData.lehrveranstaltung_id}}:
-							{{formData.bezeichnung}} | {{formData.bezeichnung_english}}</strong></h6>
 
-						<core-notiz
-							:endpoint="endpoint"
-							ref="formNotes"
-							notiz-layout="popupModal"
-							typeId="anrechnung_id"
-							:id="currentAnrechnung_id"
-							show-document
-							show-tiny-mce
-							:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
-							@reload="handleReload"
-							>
-						</core-notiz>
-					
-					</div>
+					<bs-modal ref="anrechnungsnotizModal" dialog-class="modal-dialog-scrollable modal-xl">
+
+						<template #title>
+							<h5>
+								<strong>LV {{formData.lehrveranstaltung_id}}: {{formData.bezeichnung}} | {{formData.bezeichnung_english}}
+								</strong>
+							</h5>
+						</template>
+
+						<div v-if="showNotizen" class="border p-3 overflow-auto" style="height: 800px;">
+							<core-notiz
+										:endpoint="endpoint"
+										ref="formNotes"
+										notiz-layout="classicFas"
+										typeId="anrechnung_id"
+										:id="currentAnrechnung_id"
+										show-document
+										show-tiny-mce
+										:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
+										@reload="handleReload"
+										>
+								</core-notiz>
+							</bs-modal>
+						</div>
 					
 					<template v-if="config.editableAnrechnungen" >
 						<core-filter-cmpt