diff --git a/packages/components/src/components/drawer/style.scss b/packages/components/src/components/drawer/style.scss
index 6e34289a895..8c8f51f4cf3 100644
--- a/packages/components/src/components/drawer/style.scss
+++ b/packages/components/src/components/drawer/style.scss
@@ -3,6 +3,7 @@
 
 @layer kol-component {
 	.kol-drawer {
+		$root: &;
 		font-size: rem(16);
 
 		&__dialog {
@@ -21,6 +22,10 @@
 				left: 0;
 				height: 100vh;
 				max-height: 100%;
+
+				#{$root}__content {
+					height: 100%;
+				}
 			}
 
 			&--right {
@@ -28,6 +33,10 @@
 				right: 0;
 				height: 100vh;
 				max-height: 100%;
+
+				#{$root}__content {
+					height: 100%;
+				}
 			}
 
 			&--top {
@@ -35,6 +44,10 @@
 				top: 0;
 				width: 100vw;
 				max-width: 100%;
+
+				#{$root}__content {
+					width: 100%;
+				}
 			}
 
 			&--bottom {
@@ -42,6 +55,10 @@
 				bottom: 0;
 				width: 100vw;
 				max-width: 100%;
+
+				#{$root}__content {
+					width: 100%;
+				}
 			}
 		}
 
diff --git a/packages/samples/react/src/components/drawer/basic.tsx b/packages/samples/react/src/components/drawer/basic.tsx
index 69b9c1ff672..6ab2b620eda 100644
--- a/packages/samples/react/src/components/drawer/basic.tsx
+++ b/packages/samples/react/src/components/drawer/basic.tsx
@@ -30,11 +30,13 @@ export const DrawerBasic: FC = () => {
 			<DrawerRadioAlign value={align} onChange={(_, value) => setAlign(value as AlignPropType)} />
 			<div className="flex flex-wrap gap-4">
 				<KolDrawer ref={drawerElement} _label="I am a drawer" _align={align} _on={{ onClose: () => console.log('Drawer onClose triggered!') }}>
-					<p>
-						Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam
-						voluptua.
-					</p>
-					<KolButton _label="Close drawer" _on={{ onClick: () => drawerElement.current?.close() }} />
+					<div className={align === 'left' || align == 'right' ? 'drawer-content-vertical' : ''}>
+						<p>
+							Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam
+							voluptua.
+						</p>
+						<KolButton _label="Close drawer" _on={{ onClick: () => drawerElement.current?.close() }} />
+					</div>
 				</KolDrawer>
 				<KolButton _label="Open drawer" _on={{ onClick: () => drawerElement.current?.open() }} />
 			</div>
diff --git a/packages/samples/react/src/style.scss b/packages/samples/react/src/style.scss
index df7cbca7a61..dab93d09431 100644
--- a/packages/samples/react/src/style.scss
+++ b/packages/samples/react/src/style.scss
@@ -48,6 +48,10 @@ hr {
 	width: 500px;
 }
 
+.drawer-content-vertical {
+	width: rem(400);
+}
+
 @media (min-width: 1024px) {
 	.app-container {
 		display: grid;
@@ -84,4 +88,4 @@ hr {
 	.no-print * {
 		display: none !important;
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-drawer-basic-align-left-firefox-linux.png b/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-drawer-basic-align-left-firefox-linux.png
index da120ab971d..f4f6c868d1f 100644
Binary files a/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-drawer-basic-align-left-firefox-linux.png and b/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-drawer-basic-align-left-firefox-linux.png differ
diff --git a/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-drawer-basic-align-left-zoom-firefox-linux.png b/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-drawer-basic-align-left-zoom-firefox-linux.png
index d71b58a6af8..d603a99402c 100644
Binary files a/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-drawer-basic-align-left-zoom-firefox-linux.png and b/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-drawer-basic-align-left-zoom-firefox-linux.png differ
diff --git a/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-drawer-basic-align-right-firefox-linux.png b/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-drawer-basic-align-right-firefox-linux.png
index 2dc04556320..a6b49c8fa88 100644
Binary files a/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-drawer-basic-align-right-firefox-linux.png and b/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-drawer-basic-align-right-firefox-linux.png differ
diff --git a/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-drawer-basic-align-right-zoom-firefox-linux.png b/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-drawer-basic-align-right-zoom-firefox-linux.png
index d71b58a6af8..56b6550bfb1 100644
Binary files a/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-drawer-basic-align-right-zoom-firefox-linux.png and b/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-drawer-basic-align-right-zoom-firefox-linux.png differ
diff --git a/packages/themes/default/snapshots/theme-default/snapshot-for-drawer-basic-align-left-firefox-linux.png b/packages/themes/default/snapshots/theme-default/snapshot-for-drawer-basic-align-left-firefox-linux.png
index da120ab971d..f4f6c868d1f 100644
Binary files a/packages/themes/default/snapshots/theme-default/snapshot-for-drawer-basic-align-left-firefox-linux.png and b/packages/themes/default/snapshots/theme-default/snapshot-for-drawer-basic-align-left-firefox-linux.png differ
diff --git a/packages/themes/default/snapshots/theme-default/snapshot-for-drawer-basic-align-left-zoom-firefox-linux.png b/packages/themes/default/snapshots/theme-default/snapshot-for-drawer-basic-align-left-zoom-firefox-linux.png
index d71b58a6af8..d603a99402c 100644
Binary files a/packages/themes/default/snapshots/theme-default/snapshot-for-drawer-basic-align-left-zoom-firefox-linux.png and b/packages/themes/default/snapshots/theme-default/snapshot-for-drawer-basic-align-left-zoom-firefox-linux.png differ
diff --git a/packages/themes/default/snapshots/theme-default/snapshot-for-drawer-basic-align-right-firefox-linux.png b/packages/themes/default/snapshots/theme-default/snapshot-for-drawer-basic-align-right-firefox-linux.png
index 2dc04556320..a6b49c8fa88 100644
Binary files a/packages/themes/default/snapshots/theme-default/snapshot-for-drawer-basic-align-right-firefox-linux.png and b/packages/themes/default/snapshots/theme-default/snapshot-for-drawer-basic-align-right-firefox-linux.png differ
diff --git a/packages/themes/default/snapshots/theme-default/snapshot-for-drawer-basic-align-right-zoom-firefox-linux.png b/packages/themes/default/snapshots/theme-default/snapshot-for-drawer-basic-align-right-zoom-firefox-linux.png
index d71b58a6af8..56b6550bfb1 100644
Binary files a/packages/themes/default/snapshots/theme-default/snapshot-for-drawer-basic-align-right-zoom-firefox-linux.png and b/packages/themes/default/snapshots/theme-default/snapshot-for-drawer-basic-align-right-zoom-firefox-linux.png differ