diff --git a/modules/ui-module/src/main/resources/manager/css/manager.css b/modules/ui-module/src/main/resources/manager/css/manager.css
index f7cb3b43a..0b8158cc2 100644
--- a/modules/ui-module/src/main/resources/manager/css/manager.css
+++ b/modules/ui-module/src/main/resources/manager/css/manager.css
@@ -47,88 +47,88 @@ iframe#contentPreview {
   height: 100%;
   border: none;
 }
-  */
+*/
 
 i[data-cms-section-handle] {
-  cursor: pointer;
+	cursor: pointer;
 }
 
 tr[data-cms-file-directory] {
-  cursor: pointer;
+	cursor: pointer;
 }
 
 #drop-zone {
-  width: 100%;
-  padding: 50px;
-  border: 2px dashed #aaa;
-  text-align: center;
-  margin-top: 10px;
-  transition: background-color 0.2s;
+	width: 100%;
+	padding: 50px;
+	border: 2px dashed #aaa;
+	text-align: center;
+	margin-top: 10px;
+	transition: background-color 0.2s;
 }
 
 #drop-zone.dragover {
-  background-color: #f0f8ff;
+	background-color: #f0f8ff;
 }
 
 .dropdown-nocaret::after {
-  display: none;
+	display: none;
 }
 
 
 .cms-image-hover-wrapper {
-  position: relative;
+	position: relative;
 }
 
 .cms-small-image {
-  width: 50px;
-  /* oder dein Wunschwert */
-  height: auto;
-  cursor: pointer;
+	width: 50px;
+	/* oder dein Wunschwert */
+	height: auto;
+	cursor: pointer;
 }
 
 .cms-overlay-image {
-  display: none;
-  position: absolute;
-  top: -10px;
-  left: 110%;
-  z-index: 1000;
-  background-color: white;
-  padding: 5px;
-  border: 1px solid #ccc;
-  box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
+	display: none;
+	position: absolute;
+	top: -10px;
+	left: 110%;
+	z-index: 1000;
+	background-color: white;
+	padding: 5px;
+	border: 1px solid #ccc;
+	box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
 }
 
 .cms-image-hover-wrapper:hover .cms-overlay-image {
-  display: block;
+	display: block;
 }
 
 .cms-enlarged-image {
-  width: 300px;
-  height: auto;
+	width: 300px;
+	height: auto;
 }
 
 .cms-form .cms-drop-zone {
-  border: 2px dashed #6c757d;
-  border-radius: 0.5rem;
-  padding: 1rem;
-  text-align: center;
-  color: #6c757d;
-  cursor: pointer;
+	border: 2px dashed #6c757d;
+	border-radius: 0.5rem;
+	padding: 1rem;
+	text-align: center;
+	color: #6c757d;
+	cursor: pointer;
 }
 
 .cms-form .cms-drop-zone:hover {
-  background-color: #e9ecef;
+	background-color: #e9ecef;
 }
 
 .cms-form .cms-drop-zone input {
-  display: none;
+	display: none;
 }
 
 .cms-form .cms-media-preview img {
-  width: 100px;
-  height: 100px;
-  object-fit: cover;
-  border-radius: 0.25rem;
+	width: 100px;
+	height: 100px;
+	object-fit: cover;
+	border-radius: 0.25rem;
 }
 .cms-form .cms-drop-zone.drag-over {
 	border: 2px dashed #007bff;
@@ -136,7 +136,7 @@ tr[data-cms-file-directory] {
 }
 
 .cms-toolbar-button:hover {
-  cursor: pointer;
+	cursor: pointer;
 }
 
 /* focal poit editor */
@@ -198,26 +198,26 @@ tr[data-cms-file-directory] {
 
 /* Handle Hover State */
 .cms-resize-handle:hover {
-	background: linear-gradient(to right, 
-		transparent, 
-		rgba(13, 110, 253, 0.1) 30%, 
-		rgba(13, 110, 253, 0.15) 50%, 
-		rgba(13, 110, 253, 0.1) 70%, 
+	background: linear-gradient(to right,
+		transparent,
+		rgba(13, 110, 253, 0.1) 30%,
+		rgba(13, 110, 253, 0.15) 50%,
+		rgba(13, 110, 253, 0.1) 70%,
 		transparent
-	);
+		);
 }
 
 /* Handle Active State - bleibt sichtbar während Resize */
 .cms-resize-handle:active,
 .offcanvas-end.resizable.is-resizing .cms-resize-handle {
 	opacity: 1;
-	background: linear-gradient(to right, 
-		transparent, 
-		rgba(13, 110, 253, 0.2) 30%, 
-		rgba(13, 110, 253, 0.25) 50%, 
-		rgba(13, 110, 253, 0.2) 70%, 
+	background: linear-gradient(to right,
+		transparent,
+		rgba(13, 110, 253, 0.2) 30%,
+		rgba(13, 110, 253, 0.25) 50%,
+		rgba(13, 110, 253, 0.2) 70%,
 		transparent
-	);
+		);
 }
 
 /* Visual indicator in the middle of the handle */
@@ -274,7 +274,7 @@ body.resizing-sidebar {
 		min-width: 100vw !important;
 		max-width: 100vw !important;
 	}
-	
+
 	.cms-resize-handle {
 		display: none;
 	}
@@ -309,4 +309,10 @@ body.resizing-sidebar {
 /* Backdrop darf nicht blockieren */
 .modal-backdrop.show {
 	pointer-events: none !important;
+}
+
+.cherry-editor-container .cherry-markdown,
+.cherry-editor-container .cm-editor {
+    height: 100%;
+    overflow: auto;
 }
\ No newline at end of file
diff --git a/modules/ui-module/src/main/resources/manager/js/modules/form/field.markdown.js b/modules/ui-module/src/main/resources/manager/js/modules/form/field.markdown.js
index 4627fcfd9..2062a839b 100644
--- a/modules/ui-module/src/main/resources/manager/js/modules/form/field.markdown.js
+++ b/modules/ui-module/src/main/resources/manager/js/modules/form/field.markdown.js
@@ -30,9 +30,9 @@ const createMarkdownField = (options, value = '') => {
     const key = "field." + options.name;
     const title = i18n.t(key, options.title);
     return `
-		<div class="mb-3 cms-form-field" data-cms-form-field-type="markdown" >
+		<div class="mb-3 cms-form-field flex-grow-1" data-cms-form-field-type="markdown" style="min-height: 0;">
 			<label class="form-label" cms-i18n-key="${key}">${title}</label>
-			<div id="${id}" class="cherry-editor-container" style="height: ${options.height || '300px'}; border: 1px solid #ccc;"></div>
+			<div id="${id}" class="cherry-editor-container" style="min-height: ${options.height || '300px'}; border: 1px solid #ccc;"></div>
 			<input type="hidden" name="${options.name}" data-cherry-id="${id}" data-initial-value="${encodeURIComponent(value)}">
 		</div>
 	`;
diff --git a/modules/ui-module/src/main/resources/manager/js/modules/form/forms.js b/modules/ui-module/src/main/resources/manager/js/modules/form/forms.js
index 9c0a286ca..6cc20128e 100644
--- a/modules/ui-module/src/main/resources/manager/js/modules/form/forms.js
+++ b/modules/ui-module/src/main/resources/manager/js/modules/form/forms.js
@@ -90,7 +90,7 @@ const createForm = (options) => {
         }
     }).join('\n');
     const html = `
-		<form id="${formId}" class="needs-validation h-100 cms-form" novalidate>
+		<form id="${formId}" class="needs-validation cms-form d-flex flex-column h-100" novalidate>
 			${fieldHtml}
 		</form>
 	`;
diff --git a/modules/ui-module/src/main/ts/dist/js/modules/form/field.markdown.js b/modules/ui-module/src/main/ts/dist/js/modules/form/field.markdown.js
index 4627fcfd9..2062a839b 100644
--- a/modules/ui-module/src/main/ts/dist/js/modules/form/field.markdown.js
+++ b/modules/ui-module/src/main/ts/dist/js/modules/form/field.markdown.js
@@ -30,9 +30,9 @@ const createMarkdownField = (options, value = '') => {
     const key = "field." + options.name;
     const title = i18n.t(key, options.title);
     return `
-		<div class="mb-3 cms-form-field" data-cms-form-field-type="markdown" >
+		<div class="mb-3 cms-form-field flex-grow-1" data-cms-form-field-type="markdown" style="min-height: 0;">
 			<label class="form-label" cms-i18n-key="${key}">${title}</label>
-			<div id="${id}" class="cherry-editor-container" style="height: ${options.height || '300px'}; border: 1px solid #ccc;"></div>
+			<div id="${id}" class="cherry-editor-container" style="min-height: ${options.height || '300px'}; border: 1px solid #ccc;"></div>
 			<input type="hidden" name="${options.name}" data-cherry-id="${id}" data-initial-value="${encodeURIComponent(value)}">
 		</div>
 	`;
diff --git a/modules/ui-module/src/main/ts/dist/js/modules/form/forms.js b/modules/ui-module/src/main/ts/dist/js/modules/form/forms.js
index 9c0a286ca..6cc20128e 100644
--- a/modules/ui-module/src/main/ts/dist/js/modules/form/forms.js
+++ b/modules/ui-module/src/main/ts/dist/js/modules/form/forms.js
@@ -90,7 +90,7 @@ const createForm = (options) => {
         }
     }).join('\n');
     const html = `
-		<form id="${formId}" class="needs-validation h-100 cms-form" novalidate>
+		<form id="${formId}" class="needs-validation cms-form d-flex flex-column h-100" novalidate>
 			${fieldHtml}
 		</form>
 	`;
diff --git a/modules/ui-module/src/main/ts/src/js/modules/form/field.markdown.ts b/modules/ui-module/src/main/ts/src/js/modules/form/field.markdown.ts
index 1729149dc..ed228e452 100644
--- a/modules/ui-module/src/main/ts/src/js/modules/form/field.markdown.ts
+++ b/modules/ui-module/src/main/ts/src/js/modules/form/field.markdown.ts
@@ -44,9 +44,9 @@ const createMarkdownField = (options: MarkdownFieldOptions, value: string = '')
 	const key = "field." + options.name
 	const title = i18n.t(key, options.title)
 	return `
-		<div class="mb-3 cms-form-field" data-cms-form-field-type="markdown" >
+		<div class="mb-3 cms-form-field flex-grow-1" data-cms-form-field-type="markdown" style="min-height: 0;">
 			<label class="form-label" cms-i18n-key="${key}">${title}</label>
-			<div id="${id}" class="cherry-editor-container" style="height: ${options.height || '300px'}; border: 1px solid #ccc;"></div>
+			<div id="${id}" class="cherry-editor-container" style="min-height: ${options.height || '300px'}; border: 1px solid #ccc;"></div>
 			<input type="hidden" name="${options.name}" data-cherry-id="${id}" data-initial-value="${encodeURIComponent(value)}">
 		</div>
 	`;
diff --git a/modules/ui-module/src/main/ts/src/js/modules/form/forms.ts b/modules/ui-module/src/main/ts/src/js/modules/form/forms.ts
index 3a38fe364..737727cb8 100644
--- a/modules/ui-module/src/main/ts/src/js/modules/form/forms.ts
+++ b/modules/ui-module/src/main/ts/src/js/modules/form/forms.ts
@@ -95,7 +95,7 @@ const createForm = (options) : Form => {
 	}).join('\n');
 
 	const html = `
-		<form id="${formId}" class="needs-validation h-100 cms-form" novalidate>
+		<form id="${formId}" class="needs-validation cms-form d-flex flex-column h-100" novalidate>
 			${fieldHtml}
 		</form>
 	`;