diff --git a/src/components/Widgets/MarkdownControlElements/ToolbarPluginFormControl.css b/src/components/Widgets/MarkdownControlElements/ToolbarPluginFormControl.css
new file mode 100644
index 00000000..721b8d22
--- /dev/null
+++ b/src/components/Widgets/MarkdownControlElements/ToolbarPluginFormControl.css
@@ -0,0 +1,7 @@
+.control {
+  composes: control from "../../ControlPanel/ControlPane.css"
+}
+
+.label {
+  composes: label from "../../ControlPanel/ControlPane.css";
+}
diff --git a/src/components/Widgets/MarkdownControlElements/ToolbarPluginFormControl.js b/src/components/Widgets/MarkdownControlElements/ToolbarPluginFormControl.js
new file mode 100644
index 00000000..459fdbd9
--- /dev/null
+++ b/src/components/Widgets/MarkdownControlElements/ToolbarPluginFormControl.js
@@ -0,0 +1,27 @@
+import React, { PropTypes } from 'react';
+import { resolveWidget } from '../../Widgets';
+import styles from './ToolbarPluginFormControl.css';
+
+const ToolbarPluginFormControl = ({
+  field,
+  value,
+  pluginData,
+  onAddAsset,
+  onRemoveAsset,
+  getAsset,
+  onChange,
+}) => {
+  const widget = resolveWidget(field.get('widget') || 'string');
+  const key = `field-${ field.get('name') }`;
+  const Control = widget.control;
+  const controlProps = { field, value, onAddAsset, onRemoveAsset, getAsset, onChange };
+
+  return (
+    <div className={styles.control} key={key}>
+      <label className={styles.label} htmlFor={key}>{field.get('label')}</label>
+      <Control {...controlProps}/>
+    </div>
+  );
+};
+
+export default ToolbarPluginFormControl;
diff --git a/src/components/Widgets/MarkdownControlElements/ToolbarPlugins.css b/src/components/Widgets/MarkdownControlElements/ToolbarPlugins.css
index 92c2ed6f..0c118d5d 100644
--- a/src/components/Widgets/MarkdownControlElements/ToolbarPlugins.css
+++ b/src/components/Widgets/MarkdownControlElements/ToolbarPlugins.css
@@ -47,14 +47,6 @@
   display: inline-block;
 }
 
-.control {
-  composes: control from "../../ControlPanel/ControlPane.css"
-}
-
-.label {
-  composes: label from "../../ControlPanel/ControlPane.css";
-}
-
 .footer {
   background-color: var(--backgroundColor);
   padding: 10px 20px;
diff --git a/src/components/Widgets/MarkdownControlElements/ToolbarPlugins.js b/src/components/Widgets/MarkdownControlElements/ToolbarPlugins.js
index 4af1c885..faa455b0 100644
--- a/src/components/Widgets/MarkdownControlElements/ToolbarPlugins.js
+++ b/src/components/Widgets/MarkdownControlElements/ToolbarPlugins.js
@@ -2,8 +2,8 @@ import React, { Component, PropTypes } from 'react';
 import { fromJS } from 'immutable';
 import { Button } from 'react-toolbox/lib/button';
 import { Icon } from '../../UI';
-import { resolveWidget } from '../../Widgets';
 import ToolbarButton from './ToolbarButton';
+import ToolbarPluginFormControl from './ToolbarPluginFormControl';
 import toolbarStyles from './Toolbar.css';
 import styles from './ToolbarPlugins.css';
 
@@ -43,39 +43,23 @@ export default class ToolbarPlugins extends Component {
     this.setState({ openPlugin: null });
   };
 
-  controlFor(field) {
-    const { onAddAsset, onRemoveAsset, getAsset } = this.props;
-    const { pluginData } = this.state;
-    const widget = resolveWidget(field.get('widget') || 'string');
-    const value = pluginData.get(field.get('name'));
-    const key = `field-${ field.get('name') }`;
-
-    return (
-      <div className={styles.control} key={key}>
-        <label className={styles.label} htmlFor={key}>{field.get('label')}</label>
-        {
-          React.createElement(widget.control, {
-            field,
-            value,
-            onChange: (val) => {
-              this.setState({
-                pluginData: pluginData.set(field.get('name'), val),
-              });
-            },
-            onAddAsset,
-            onRemoveAsset,
-            getAsset,
-          })
-        }
-      </div>
-    );
-  }
-
   pluginForm(plugin) {
     return (<form className={styles.pluginForm} onSubmit={this.handleSubmit}>
       <h3 className={styles.header}>Insert {plugin.get('label')}</h3>
       <div className={styles.body}>
-        {plugin.get('fields').map(field => this.controlFor(field))}
+        {plugin.get('fields').map((field, index) => (
+          <ToolbarPluginFormControl
+            key={index}
+            field={field}
+            value={this.state.pluginData.get(field.get('name'))}
+            onAddAsset={this.props.onAddAsset}
+            onRemoveAsset={this.props.onRemoveAsset}
+            getAsset={this.props.getAsset}
+            onChange={(val) => {
+              this.setState({ pluginData: this.state.pluginData.set(field.get('name'), val) });
+            }}
+          />
+        ))}
       </div>
       <div className={styles.footer}>
         <Button