diff --git a/src/__story__/figma.story.tsx b/src/__story__/figma.story.tsx
index 9afd06254..f5df56789 100644
--- a/src/__story__/figma.story.tsx
+++ b/src/__story__/figma.story.tsx
@@ -1,6 +1,14 @@
 import * as React from 'react';
 import {storiesOf} from '@storybook/react';
 import Embed from '..';
+import {Box} from './Box';
 
 storiesOf('figma', module)
   .add('Site link', () => <Embed url={'https://www.figma.com/file/LFRrspoKaAYUlEHLZiLoQX/Google-Material-Design?node-id=0%3A1'} />)
+  .add('Fitted', () => {
+    return (
+      <Box>
+        <Embed url={'https://www.figma.com/file/LFRrspoKaAYUlEHLZiLoQX/Google-Material-Design?node-id=0%3A1'} />
+      </Box>
+    );
+  })
diff --git a/src/__story__/gfycat.story.tsx b/src/__story__/gfycat.story.tsx
index 54ad7b7b7..5af3d6d48 100644
--- a/src/__story__/gfycat.story.tsx
+++ b/src/__story__/gfycat.story.tsx
@@ -1,7 +1,15 @@
 import * as React from 'react';
 import {storiesOf} from '@storybook/react';
 import Embed from '..';
+import {Box} from './Box';
 
 storiesOf('gfycat', module)
   .add('Site link', () => <Embed url={'https://gfycat.com/snivelingflimsyfunnelweaverspider'} />)
   .add('Site link - 2', () => <Embed url={'https://gfycat.com/bittervainchuckwalla-airplane-transportation'} />)
+  .add('Fitted', () => {
+    return (
+      <Box>
+        <Embed url={'https://gfycat.com/snivelingflimsyfunnelweaverspider'} />
+      </Box>
+    );
+  })
diff --git a/src/blocks/figma/index.tsx b/src/blocks/figma/index.tsx
index 78a5cd273..284ab22f5 100644
--- a/src/blocks/figma/index.tsx
+++ b/src/blocks/figma/index.tsx
@@ -1,16 +1,31 @@
 import * as React from 'react';
 import {BlockProps} from '../..';
+import {rule} from 'p4-css';
+
+const blockClass = rule({
+  d: 'block',
+  ov: 'hidden',
+  w: '100%',
+  bd: '1px solid #E5E9F2',
+  bdrad: '6px',
+  '& iframe': {
+    d: 'block',
+    ov: 'hidden',
+    bd: 0,
+    w: '100%',
+    h: '450px',
+    bdrad: '8px',
+  },
+});
 
 const Figma: React.SFC<BlockProps> = ({url}) => {
   return (
-    <iframe
-      frameBorder="no"
-      style={{border: 'none'}}
-      width="100%"
-      height="450px"
-      src={`https://www.figma.com/embed?embed_host=share&url=${encodeURIComponent(url)}`}
-      allowFullScreen
-    />
+    <div className={blockClass}>
+      <iframe
+        src={`https://www.figma.com/embed?embed_host=share&url=${encodeURIComponent(url)}`}
+        allowFullScreen
+      />
+    </div>
   );
 }