diff --git a/.storybook/preview.js b/.storybook/preview.js
index ec5bfb53ee..fa81b9d678 100644
--- a/.storybook/preview.js
+++ b/.storybook/preview.js
@@ -5,4 +5,4 @@ import '../assets/dist/css/mailpoet-plugin.css';
 import '../assets/dist/css/mailpoet-form-editor.css';
 
 addDecorator(withPerformance);
-addDecorator(story => <div id="wpbody" style={{fontFamily:'sans-serif'}}>{story()}</div>);
+addDecorator(story => <div id="wpbody" style={{fontFamily:'sans-serif'}}><div id="mailpoet-modal"></div>{story()}</div>);
diff --git a/assets/js/src/common/modal/_stories/modal.tsx b/assets/js/src/common/modal/_stories/modal.tsx
new file mode 100644
index 0000000000..2ff829e4a9
--- /dev/null
+++ b/assets/js/src/common/modal/_stories/modal.tsx
@@ -0,0 +1,87 @@
+import React, { useState } from 'react';
+import Button from '../../button/button';
+import Modal from '../modal';
+import Heading from '../../typography/heading/heading';
+
+const shortContent = (
+  <>
+    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
+    <p>Morbi libero sapien, tristique sollicitudin lobortis id, viverra id libero.</p>
+    <p>Mauris dolor felis, sagittis at, luctus sed, aliquam non, tellus.</p>
+  </>
+);
+
+const longContent = (
+  <>
+    <p>{'Lorem ipsum dolor sit amet, consectetur adipiscing elit. '.repeat(20)}</p>
+    <p>{'Morbi libero sapien, tristique sollicitudin lobortis id, viverra id libero. '.repeat(20)}</p>
+    <p>{'Mauris dolor felis, sagittis at, luctus sed, aliquam non, tellus. '.repeat(20)}</p>
+    <p>{'Vivamus ac leo pretium faucibus.'.repeat(20)}</p>
+    <p>{'Etiam dui sem, fermentum vitae, sagittis id, malesuada in, quam. '.repeat(20)}</p>
+    <p>{'Duis sapien nunc, commodo et, interdum suscipit, sollicitudin et, dolor. '.repeat(20)}</p>
+    <p>{'Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. '.repeat(20)}</p>
+    <p>{'Cras pede libero, dapibus nec, pretium sit amet, tempor quis. '.repeat(20)}</p>
+  </>
+);
+
+export default {
+  title: 'Modal',
+  component: Modal,
+};
+
+const ModalWrapper = ({
+  buttonCaption,
+  title = 'Modal title',
+  isDismissible = true,
+  content = shortContent,
+  fullScreen = false,
+}) => {
+  const [showModal, setShowModal] = useState(false);
+  return (
+    <p>
+      <Button
+        onClick={() => setShowModal(true)}
+        dimension="small"
+        variant="light"
+      >
+        {buttonCaption}
+      </Button>
+      {showModal && (
+        <Modal
+          title={title}
+          onRequestClose={() => setShowModal(false)}
+          isDismissible={isDismissible}
+          fullScreen={fullScreen}
+        >
+          {content}
+        </Modal>
+      ) }
+    </p>
+  );
+};
+
+export const Modals = () => (
+  <>
+    <Heading level={3}>Modal with short text</Heading>
+    <ModalWrapper buttonCaption="Show modal with title, with close button" />
+    <ModalWrapper buttonCaption="Show modal with title, without close button" isDismissible={false} />
+    <ModalWrapper buttonCaption="Show modal without title, with close button" title={null} />
+    <ModalWrapper buttonCaption="Show modal without title, without close button" title={null} isDismissible={false} />
+
+    <div className="mailpoet-gap" />
+
+    <Heading level={3}>Modal with long text</Heading>
+    <ModalWrapper buttonCaption="Show modal with title, with close button" content={longContent} />
+    <ModalWrapper buttonCaption="Show modal with title, without close button" isDismissible={false} content={longContent} />
+    <ModalWrapper buttonCaption="Show modal without title, with close button" title={null} content={longContent} />
+    <ModalWrapper buttonCaption="Show modal without title, without close button" title={null} isDismissible={false} content={longContent} />
+
+    <div className="mailpoet-gap" />
+
+    <Heading level={3}>Full-screen modal</Heading>
+    <ModalWrapper buttonCaption="Show modal with title, with close button" content={longContent} fullScreen />
+    <ModalWrapper buttonCaption="Show modal with title, without close button" isDismissible={false} content={longContent} fullScreen />
+    <ModalWrapper buttonCaption="Show modal without title, with close button" title={null} content={longContent} fullScreen />
+    <ModalWrapper buttonCaption="Show modal without title, without close button" title={null} isDismissible={false} content={longContent} fullScreen />
+  </>
+);
diff --git a/assets/js/src/common/modal/header.tsx b/assets/js/src/common/modal/header.tsx
index 9295ffe6d7..f082730c7e 100644
--- a/assets/js/src/common/modal/header.tsx
+++ b/assets/js/src/common/modal/header.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import Heading from 'common/typography/heading/heading';
+import Heading from '../typography/heading/heading';
 
 type Props = {
   title: string,