diff --git a/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6 b/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6
index a5e00e3..66aad96 100644
--- a/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6
@@ -96,8 +96,9 @@ export default Ember.Controller.extend({
       this.set('everEditing', false);
     },
 
-    goBack() {
-      history.back();
+    goHome() {
+      this.set('selectedQueryId', null);
+      this.transitionToRoute('adminPlugins.explorer');
     },
 
     resetParams() {
diff --git a/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs b/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
index 7148f09..4a5149a 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
@@ -34,7 +34,7 @@
             {{#if editing}}
               <div class="name">
                 <div class="previous">
-                  {{d-button action="goBack" icon="chevron-left" class="no-text btn-med"}}
+                  {{d-button action="goHome" icon="chevron-left" class="no-text btn-med"}}
                 </div>
                 {{text-field value=selectedItem.name}}
               </div>
@@ -44,7 +44,7 @@
             {{else}}
               <div class="name">
                 <div class="previous">
-                  {{d-button action="goBack" icon="chevron-left" class="no-text btn-med"}}
+                  {{d-button action="goHome" icon="chevron-left" class="no-text btn-med"}}
                 </div>
                 <h2>{{selectedItem.name}}</h2>
                 {{d-button action="editName" icon="pencil" class="no-text btn-small"}}