diff --git a/src/public/app/widgets/containers/ribbon_container.js b/src/public/app/widgets/containers/ribbon_container.js
index a344bef3a..c5b371538 100644
--- a/src/public/app/widgets/containers/ribbon_container.js
+++ b/src/public/app/widgets/containers/ribbon_container.js
@@ -195,6 +195,12 @@ export default class RibbonContainer extends NoteContextAwareWidget {
         }
     }
 
+    async noteSwitched() {
+        this.lastActiveComponentId = null;
+
+        await super.noteSwitched();
+    }
+
     async refreshWithNote(note, noExplicitActivation = false) {
         this.lastNoteType = note.type;
 
diff --git a/src/public/app/widgets/ribbon_widgets/search_definition.js b/src/public/app/widgets/ribbon_widgets/search_definition.js
index 014af8602..47b1ec543 100644
--- a/src/public/app/widgets/ribbon_widgets/search_definition.js
+++ b/src/public/app/widgets/ribbon_widgets/search_definition.js
@@ -168,6 +168,10 @@ const OPTION_CLASSES = [
 ];
 
 export default class SearchDefinitionWidget extends NoteContextAwareWidget {
+    get name() {
+        return "searchDefinition";
+    }
+
     isEnabled() {
         return this.note && this.note.type === 'search';
     }