diff --git a/dist/client/manager/provider.js b/dist/client/manager/provider.js
index c94acbf2c6cd..8de632e5274a 100644
--- a/dist/client/manager/provider.js
+++ b/dist/client/manager/provider.js
@@ -80,9 +80,19 @@ var ReactProvider = function (_Provider) {
         selectedStory: selectedStory
       };
 
+      var DefaultPreviewDecorator = function DefaultPreviewDecorator(_ref) {
+        var children = _ref.children;
+        return children;
+      };
+      var PreviewDecorator = _storybookAddons2.default.getPreviewDecorator() || DefaultPreviewDecorator;
+
       var queryString = _qs2.default.stringify(queryParams);
       var url = 'iframe.html?' + queryString;
-      return _react2.default.createElement(_preview2.default, { url: url });
+      return _react2.default.createElement(
+        PreviewDecorator,
+        null,
+        _react2.default.createElement(_preview2.default, { url: url })
+      );
     }
   }, {
     key: 'handleAPI',
diff --git a/dist/server/build.js b/dist/server/build.js
old mode 100755
new mode 100644
diff --git a/package.json b/package.json
index c97545ff62be..b46912fd67a4 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "@kadira/react-split-pane": "^1.4.0",
     "@kadira/storybook-addon-actions": "^1.0.2",
     "@kadira/storybook-addon-links": "^1.0.0",
-    "@kadira/storybook-addons": "^1.5.0",
+    "@kadira/storybook-addons": "^1.6.0",
     "@kadira/storybook-channel-postmsg": "^1.0.3",
     "@kadira/storybook-ui": "^3.6.0",
     "airbnb-js-shims": "^1.0.1",
diff --git a/src/client/manager/provider.js b/src/client/manager/provider.js
index 05452616aacf..7bd90be80b9f 100644
--- a/src/client/manager/provider.js
+++ b/src/client/manager/provider.js
@@ -28,10 +28,15 @@ export default class ReactProvider extends Provider {
       selectedStory,
     };
 
+    const DefaultPreviewDecorator = ({ children }) => children;
+    const PreviewDecorator = addons.getPreviewDecorator() || DefaultPreviewDecorator;
+
     const queryString = qs.stringify(queryParams);
     const url = `iframe.html?${queryString}`;
     return (
-      <Preview url={url} />
+      <PreviewDecorator>
+        <Preview url={url} />
+      </PreviewDecorator>
     );
   }
 
diff --git a/yarn.lock b/yarn.lock
index 5f46ea1e2eb4..dcaec1415201 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -32,9 +32,9 @@
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@kadira/storybook-addon-links/-/storybook-addon-links-1.0.1.tgz#566136a8020b60f82f146ef37d93b0c86de969d8"
 
-"@kadira/storybook-addons@^1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@kadira/storybook-addons/-/storybook-addons-1.5.0.tgz#f92cd2059282a9b4b8bdac4bef28269f85e40be4"
+"@kadira/storybook-addons@^1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@kadira/storybook-addons/-/storybook-addons-1.6.0.tgz#b47a4076b3e0f4dcba0de4c322ce967e36233059"
 
 "@kadira/storybook-channel-postmsg@^1.0.3":
   version "1.0.3"