diff --git a/packages/components/src/components/drawer/style.scss b/packages/components/src/components/drawer/style.scss
index bb625a37750..2e8b40331c9 100644
--- a/packages/components/src/components/drawer/style.scss
+++ b/packages/components/src/components/drawer/style.scss
@@ -19,6 +19,10 @@
 				left: 0;
 				height: 100vh;
 				max-height: 100%;
+
+				.drawer__content {
+					height: 100%;
+				}
 			}
 
 			&--right {
@@ -26,6 +30,10 @@
 				right: 0;
 				height: 100vh;
 				max-height: 100%;
+
+				.drawer__content {
+					height: 100%;
+				}
 			}
 
 			&--top {
@@ -33,6 +41,10 @@
 				top: 0;
 				width: 100vw;
 				max-width: 100%;
+
+				.drawer__content {
+					width: 100%;
+				}
 			}
 
 			&--bottom {
@@ -40,6 +52,10 @@
 				bottom: 0;
 				width: 100vw;
 				max-width: 100%;
+
+				.drawer__content {
+					width: 100%;
+				}
 			}
 		}
 
diff --git a/packages/samples/react/src/components/drawer/basic.tsx b/packages/samples/react/src/components/drawer/basic.tsx
index 47e9c929149..890793da703 100644
--- a/packages/samples/react/src/components/drawer/basic.tsx
+++ b/packages/samples/react/src/components/drawer/basic.tsx
@@ -34,11 +34,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() }} />
 				<KolDrawer
@@ -48,11 +50,13 @@ export const DrawerBasic: FC = () => {
 					_label="I am a Drawer Modal"
 					_on={{ onClose: () => console.log('Drawer Modal 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 modal" _on={{ onClick: () => drawerModalElement.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 modal" _on={{ onClick: () => drawerModalElement.current?.close() }} />
+					</div>
 				</KolDrawer>
 				<KolButton _label="Open drawer as modal" _on={{ onClick: () => drawerModalElement.current?.open() }} />
 			</div>
diff --git a/packages/samples/react/src/style.scss b/packages/samples/react/src/style.scss
index df7cbca7a61..7e7140a383a 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;
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 cae7ee7d432..635e743e9a9 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 380708a8e1e..55b5f4829b9 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 f9bdae96e9f..be046e81dd7 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 380708a8e1e..4af84db419b 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/bwst/snapshots/theme-bwst/snapshot-for-drawer-basic-align-left-firefox-linux.png b/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-drawer-basic-align-left-firefox-linux.png
index bbfb5a6dbd3..238c2687664 100644
Binary files a/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-drawer-basic-align-left-firefox-linux.png and b/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-drawer-basic-align-left-firefox-linux.png differ
diff --git a/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-drawer-basic-align-left-zoom-firefox-linux.png b/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-drawer-basic-align-left-zoom-firefox-linux.png
index 3fb806be8c9..1f3e1c9f13d 100644
Binary files a/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-drawer-basic-align-left-zoom-firefox-linux.png and b/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-drawer-basic-align-left-zoom-firefox-linux.png differ
diff --git a/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-drawer-basic-align-right-firefox-linux.png b/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-drawer-basic-align-right-firefox-linux.png
index fb3cf3aa88e..f6223e45453 100644
Binary files a/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-drawer-basic-align-right-firefox-linux.png and b/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-drawer-basic-align-right-firefox-linux.png differ
diff --git a/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-drawer-basic-align-right-zoom-firefox-linux.png b/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-drawer-basic-align-right-zoom-firefox-linux.png
index 3fb806be8c9..77c22479992 100644
Binary files a/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-drawer-basic-align-right-zoom-firefox-linux.png and b/packages/themes/bwst/snapshots/theme-bwst/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 cae7ee7d432..635e743e9a9 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 380708a8e1e..55b5f4829b9 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 f9bdae96e9f..be046e81dd7 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 380708a8e1e..4af84db419b 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