diff --git a/scripts/build-scoped-wp-components-css.mjs b/scripts/build-scoped-wp-components-css.mjs
index 1ce224a..41d2dca 100644
--- a/scripts/build-scoped-wp-components-css.mjs
+++ b/scripts/build-scoped-wp-components-css.mjs
@@ -16,6 +16,7 @@ const OUTPUT_CSS = path.join( ROOT, 'dist', 'wp-components-scoped.css' )
 const COMPONENT_SCOPES = [
 	'.interact-builder-root',
 	'.interact-popover',
+	'.interact-modal',
 ]
 const BODY_SCOPE = 'body.interact-builder-editor'
 const PORTAL_PATTERNS = [
diff --git a/src/editor/components/import-export-modal/editor.scss b/src/editor/components/import-export-modal/editor.scss
index a195ecd..f3fcccb 100644
--- a/src/editor/components/import-export-modal/editor.scss
+++ b/src/editor/components/import-export-modal/editor.scss
@@ -8,12 +8,13 @@
 	z-index: 100001;
 }
 
-.interact-import-export-modal {
+.interact-modal.interact-import-export-modal {
 	width: 100%;
 	max-width: 50%;
 	max-height: 90%;
 	margin: 0 !important;
 	z-index: 100002;
+	line-height: 1.5;
 
 	.components-modal__content {
 		margin-top: 56px;
diff --git a/src/editor/components/import-export-modal/index.js b/src/editor/components/import-export-modal/index.js
index 44727f7..ab49636 100644
--- a/src/editor/components/import-export-modal/index.js
+++ b/src/editor/components/import-export-modal/index.js
@@ -182,7 +182,7 @@ const ImportExportModal = props => {
 	return (
 		<Modal
 			title={ title }
-			className="interact-import-export-modal"
+			className="interact-modal interact-import-export-modal"
 			onRequestClose={ onClose }
 		>
 			<div className="interact-import-export-modal__wrapper">
diff --git a/src/editor/interaction-library/index.js b/src/editor/interaction-library/index.js
index ffa5132..1c153a7 100644
--- a/src/editor/interaction-library/index.js
+++ b/src/editor/interaction-library/index.js
@@ -238,7 +238,7 @@ export const InteractionLibrary = () => {
 					/>
 				) }
 			</> }
-			className="interact-interaction-library-modal"
+			className="interact-modal interact-interaction-library-modal"
 			onRequestClose={ handleClose }
 		>
 			{ isLoadingPresets ? (
diff --git a/src/editor/plugins/block-toolbar-button/index.js b/src/editor/plugins/block-toolbar-button/index.js
index 0a082be..7ad49be 100644
--- a/src/editor/plugins/block-toolbar-button/index.js
+++ b/src/editor/plugins/block-toolbar-button/index.js
@@ -151,7 +151,7 @@ const withBlockToolbarButton = createHigherOrderComponent( BlockEdit => {
 						) }
 						{ isPopoverOpen && popoverMode === 'select' && (
 							<Popover
-								className="interact-block-toolbar-button__select-popover"
+								className="interact-popover interact-block-toolbar-button__select-popover"
 								offset={ 13 }
 								flip={ true }
 								variant="toolbar"