diff --git a/addons/info/src/components/Story.js b/addons/info/src/components/Story.js
index 7e412085cc40..266dbeddf5a9 100644
--- a/addons/info/src/components/Story.js
+++ b/addons/info/src/components/Story.js
@@ -125,11 +125,13 @@ export default class Story extends React.Component {
   _renderInline() {
     return (
       <div>
-        <div style={this.state.stylesheet.infoPage}>
-          <div style={this.state.stylesheet.infoBody}>
-            {this._getInfoHeader()}
-          </div>
-        </div>
+        {this.props.context &&
+          this.props.showHeader &&
+          <div style={this.state.stylesheet.infoPage}>
+            <div style={this.state.stylesheet.infoBody}>
+              {this._getInfoHeader()}
+            </div>
+          </div>}
         <div>
           {this._renderStory()}
         </div>