diff --git a/packages/builder/package.json b/packages/builder/package.json
index 1b12b088f..9a3736529 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -31,6 +31,7 @@
     "react-dnd": "^2.1.4",
     "react-dnd-html5-backend": "^2.1.2",
     "react-dom": "^16.0.0",
+    "react-loadable": "^5.3.1",
     "react-modal": "^3.2.1",
     "react-monaco-editor": "^0.12.0",
     "react-redux": "^5.0.6",
diff --git a/packages/builder/src/components/ComponentOptions/components/Content/Canvas/index.js b/packages/builder/src/components/ComponentOptions/components/Content/Canvas/index.js
index 5fc66707d..1f6b3bdb7 100644
--- a/packages/builder/src/components/ComponentOptions/components/Content/Canvas/index.js
+++ b/packages/builder/src/components/ComponentOptions/components/Content/Canvas/index.js
@@ -1,14 +1,22 @@
 import React from 'react'
 import PropTypes from 'prop-types'
+import Loadable from 'react-loadable'
 
 import Card from '../../../../Card'
-import CanvasEditor from './editor'
-
 import { updateComponent } from '../../../../../actions/components'
 
+const LoadableEditor = Loadable({
+  loader: () => import('./editor'),
+  loading() {
+    return <div className="text-center">
+      <i className="fas fa-spinner-third fa-spin my-3" />
+    </div>
+  }
+})
+
 const Editor = ({ id, data }, { store }) =>
   <Card title="Content">
-    <CanvasEditor
+    <LoadableEditor
       data={ data.content }
       onChange={
         newData => store.dispatch(