diff --git a/src/Explorer/Controls/Editor/EditorReact.tsx b/src/Explorer/Controls/Editor/EditorReact.tsx
index 662b78056..e97cf5da4 100644
--- a/src/Explorer/Controls/Editor/EditorReact.tsx
+++ b/src/Explorer/Controls/Editor/EditorReact.tsx
@@ -33,6 +33,12 @@ export class EditorReact extends React.Component<EditorReactProps, EditorReactSt
     this.createEditor(this.configureEditor.bind(this));
   }
 
+  public componentDidUpdate(previous: EditorReactProps) {
+    if (this.props.content !== previous.content) {
+      this.editor.setValue(this.props.content);
+    }
+  }
+
   public componentWillUnmount(): void {
     this.selectionListener && this.selectionListener.dispose();
   }
diff --git a/src/Explorer/Tabs/QueryTab/QueryTabComponent.tsx b/src/Explorer/Tabs/QueryTab/QueryTabComponent.tsx
index 327f25a38..73f5bf8b6 100644
--- a/src/Explorer/Tabs/QueryTab/QueryTabComponent.tsx
+++ b/src/Explorer/Tabs/QueryTab/QueryTabComponent.tsx
@@ -102,7 +102,6 @@ interface IQueryTabStates {
 export default class QueryTabComponent extends React.Component<IQueryTabComponentProps, IQueryTabStates> {
   public queryEditorId: string;
   public executeQueryButton: Button;
-  public fetchNextPageButton: Button;
   public saveQueryButton: Button;
   public splitterId: string;
   public splitter: Splitter;
@@ -195,23 +194,6 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
       enabled: this.state._isSaveQueriesEnabled,
       visible: this.state._isSaveQueriesEnabled,
     };
-    this.fetchNextPageButton = {
-      enabled: (() => {
-        const allResultsMetadata = this.state.allResultsMetadata || [];
-        const numberOfResultsMetadata = allResultsMetadata.length;
-
-        if (numberOfResultsMetadata === 0) {
-          return false;
-        }
-
-        if (allResultsMetadata[numberOfResultsMetadata - 1].hasMoreResults) {
-          return true;
-        }
-
-        return false;
-      })(),
-      visible: true,
-    };
 
     this._buildCommandBarOptions();
     props.onTabAccessor({
@@ -981,14 +963,17 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
                               <span>
                                 <span>{this.state.showingDocumentsDisplayText}</span>
                               </span>
-                              {this.fetchNextPageButton.enabled && <span className="queryResultDivider">|</span>}
-                              {this.fetchNextPageButton.enabled && (
-                                <span className="queryResultNextEnable">
-                                  <a onClick={this.onFetchNextPageClick}>
-                                    <span>Load more</span>
-                                    <img className="queryResultnextImg" src={QueryEditorNext} alt="Fetch next page" />
-                                  </a>
-                                </span>
+                              {this.state.allResultsMetadata[this.state.allResultsMetadata.length - 1]
+                                .hasMoreResults && (
+                                <>
+                                  <span className="queryResultDivider">|</span>
+                                  <span className="queryResultNextEnable">
+                                    <a onClick={this.onFetchNextPageClick.bind(this)}>
+                                      <span>Load more</span>
+                                      <img className="queryResultnextImg" src={QueryEditorNext} alt="Fetch next page" />
+                                    </a>
+                                  </span>
+                                </>
                               )}
                             </div>
                             {this.state.queryResults &&