diff --git a/CHANGELOG.md b/CHANGELOG.md
index f53892889a..bd478009fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,11 @@
 ## v1.4.0.0 [unreleased]
 ### Features
+
 ### UI Improvements
+1. [#2652](https://github.com/influxdata/chronograf/pull/2652): Add page header with instructional copy when adding initial source for consistency and clearer UX
+
 ### Bug Fixes
+1. [#2652](https://github.com/influxdata/chronograf/pull/2652): Make page render successfully when attempting to edit a source
 
 ## v1.4.0.0-rc2 [2017-12-21]
 ### UI Improvements
diff --git a/ui/src/sources/containers/SourcePage.js b/ui/src/sources/containers/SourcePage.js
index 7d0d792e00..861fc3cc3e 100644
--- a/ui/src/sources/containers/SourcePage.js
+++ b/ui/src/sources/containers/SourcePage.js
@@ -201,45 +201,43 @@ class SourcePage extends Component {
     }
 
     return (
-      <div>
+      <div className={`${isInitialSource ? '' : 'page'}`}>
         <Notifications />
-        <div className={`${isInitialSource ? '' : 'page'}`}>
-          {isInitialSource
-            ? null
-            : <div className="page-header">
-                <div className="page-header__container page-header__source-page">
-                  <div className="page-header__col-md-8">
-                    <div className="page-header__left">
-                      <h1 className="page-header__title">
-                        {editMode ? 'Edit Source' : 'Add a New Source'}
-                      </h1>
-                    </div>
-                    <div className="page-header__right">
-                      <SourceIndicator />
-                    </div>
-                  </div>
-                </div>
-              </div>}
-          <FancyScrollbar className="page-contents">
-            <div className="container-fluid">
-              <div className="row">
-                <div className="col-md-8 col-md-offset-2">
-                  <div className="panel panel-minimal">
-                    <SourceForm
-                      source={source}
-                      editMode={editMode}
-                      onInputChange={this.handleInputChange}
-                      onSubmit={this.handleSubmit}
-                      onBlurSourceURL={this.handleBlurSourceURL}
-                      isInitialSource={isInitialSource}
-                      gotoPurgatory={this.gotoPurgatory}
-                    />
-                  </div>
+        <div className="page-header">
+          <div className="page-header__container page-header__source-page">
+            <div className="page-header__col-md-8">
+              <div className="page-header__left">
+                <h1 className="page-header__title">
+                  {editMode ? 'Edit Source' : 'Add a New Source'}
+                </h1>
+              </div>
+              {isInitialSource
+                ? null
+                : <div className="page-header__right">
+                    <SourceIndicator />
+                  </div>}
+            </div>
+          </div>
+        </div>
+        <FancyScrollbar className="page-contents">
+          <div className="container-fluid">
+            <div className="row">
+              <div className="col-md-8 col-md-offset-2">
+                <div className="panel panel-minimal">
+                  <SourceForm
+                    source={source}
+                    editMode={editMode}
+                    onInputChange={this.handleInputChange}
+                    onSubmit={this.handleSubmit}
+                    onBlurSourceURL={this.handleBlurSourceURL}
+                    isInitialSource={isInitialSource}
+                    gotoPurgatory={this.gotoPurgatory}
+                  />
                 </div>
               </div>
             </div>
-          </FancyScrollbar>
-        </div>
+          </div>
+        </FancyScrollbar>
       </div>
     )
   }