diff --git a/src/block/design-library/edit.js b/src/block/design-library/edit.js
index 54c477aa6..8d7f833de 100644
--- a/src/block/design-library/edit.js
+++ b/src/block/design-library/edit.js
@@ -85,7 +85,10 @@ const Edit = props => {
 	}
 
 	return (
-		<div className="ugb-design-library-block">
+		<div
+			className="ugb-design-library-block"
+			data-block={ props.clientId }
+		>
 			<Placeholder
 				icon={ <SVGStackableIcon /> }
 				label={ __( 'Stackable Design Library', i18n ) }
diff --git a/src/components/design-library-list/editor.scss b/src/components/design-library-list/editor.scss
index d979f0ea3..28c05411d 100644
--- a/src/components/design-library-list/editor.scss
+++ b/src/components/design-library-list/editor.scss
@@ -19,6 +19,7 @@
 	.components-base-control__help {
 		text-align: center;
 		font-style: italic;
+		grid-column: 1 / 4;
 	}
 	.ugb-design-library-search__spinner {
 		display: flex;
diff --git a/src/components/modal-design-library/editor.scss b/src/components/modal-design-library/editor.scss
index e1754a8f2..78642d957 100644
--- a/src/components/modal-design-library/editor.scss
+++ b/src/components/modal-design-library/editor.scss
@@ -22,6 +22,7 @@
 		flex-direction: column;
 	}
 	.components-modal__header {
+		padding: 0px;
 		margin: 0;
 		height: 58px;
 		border-bottom: 1px solid #ddd;
@@ -30,6 +31,9 @@
 		}
 		.components-button {
 			left: 0 !important;
+			&.has-icon {
+				margin: 10px;
+			}
 		}
 	}
 	.ugb-modal-design-library__wrapper {
@@ -37,6 +41,7 @@
 		grid-template-columns: 300px auto;
 		grid-template-rows: 80px auto;
 		flex: 1;
+		height: 100%;
 	}
 	.ugb-modal-design-library__sidebar {
 		box-shadow: 0 0 30px rgba(0, 0, 0, 0.1);
@@ -47,7 +52,6 @@
 		flex-direction: column;
 		overflow: hidden;
 		z-index: 1;
-
 		.ugb-control-separator {
 			margin: 8px 0 !important;
 			width: 100% !important;
@@ -57,7 +61,7 @@
 		display: flex;
 		justify-content: flex-end;
 		padding: 0 24px;
-		height: 80px;
+		height: 64px;
 		align-items: center;
 		grid-column: 2 / 3;
 		grid-row: 1 / 2;
@@ -250,6 +254,7 @@
 .ugb-modal-design-library .components-modal__header-heading {
 	display: flex;
 	align-items: center;
+	padding: 0 32px;
 	.ugb-advanced-toolbar-control {
 		margin: 0 32px;
 		> *,
@@ -280,3 +285,8 @@
 		}
 	}
 }
+
+// Fix WP 6.3 a div wraps the .ugb-modal-design-library__wrapper
+.ugb-modal-design-library .components-modal__content > div:not(.components-modal__header) {
+	height: 100%;
+}
diff --git a/src/deprecated/v2/components/modal-design-library/editor.scss b/src/deprecated/v2/components/modal-design-library/editor.scss
index 0b8437b5e..1a0af2ea8 100644
--- a/src/deprecated/v2/components/modal-design-library/editor.scss
+++ b/src/deprecated/v2/components/modal-design-library/editor.scss
@@ -43,7 +43,7 @@
 		display: flex;
 		justify-content: flex-end;
 		padding: 0 24px;
-		height: 50px;
+		height: 64px;
 		align-items: center;
 		grid-column: 2 / 3;
 		grid-row: 1 / 2;