diff --git a/app/components/Explorer/Explorer.js b/app/components/Explorer/Explorer.js
index 7da807f0c..efbfb8802 100644
--- a/app/components/Explorer/Explorer.js
+++ b/app/components/Explorer/Explorer.js
@@ -111,12 +111,21 @@ export default class Explorer extends Component {
     }
   }
 
+  clearDefaultQueryState() {
+    this.setState({ query: undefined, variables: undefined });
+  }
+
   render() {
     const { noFetch } = this.state;
     const graphiql = (
-      <GraphiQL fetcher={this.graphQLFetcher} defaultQuery={this.state.query}
-                variables={this.state.variables}
-                ref={r => {this.graphiql = r}}>
+      <GraphiQL
+        fetcher={this.graphQLFetcher}
+        query={this.state.query}
+        onEditQuery={() => { this.clearDefaultQueryState() }}
+        onEditVariables={() => { this.clearDefaultQueryState() }}
+        variables={this.state.variables}
+        ref={r => {this.graphiql = r}}
+      >
         <GraphiQL.Toolbar>
           <label>
             <input
diff --git a/extension/manifest.json b/extension/manifest.json
index 6836fcbaa..f6685f806 100644
--- a/extension/manifest.json
+++ b/extension/manifest.json
@@ -1,5 +1,5 @@
 {
-    "version": "1.0.1",
+    "version": "1.0.2",
     "name": "Apollo Client Developer Tools",
     "short_name": "Apollo DevTools",