diff --git a/src/components/modeler/Modeler.vue b/src/components/modeler/Modeler.vue
index a38d5a959..3c9201daf 100644
--- a/src/components/modeler/Modeler.vue
+++ b/src/components/modeler/Modeler.vue
@@ -56,7 +56,7 @@
 
       <InspectorButton
         ref="inspector-button"
-        v-if="showComponent && showInspectorButton"
+        v-show="showComponent && showInspectorButton"
         :showInspector="isOpenInspector"
         @toggleInspector="[handleToggleInspector($event), setInspectorButtonPosition($event)]"
         :style="{ right: inspectorButtonRight + 'px' }"
@@ -371,6 +371,11 @@ export default {
     canvasScale(canvasScale) {
       this.paperManager.scale = canvasScale;
     },
+    highlightedNodes() {
+      if (window.ProcessMaker?.EventBus) {
+        window.ProcessMaker.EventBus.$emit('modeler:highlightedNodes', this.highlightedNodes);
+      }
+    },
   },
   computed: {
     showWelcomeMessage() {
diff --git a/src/components/toolbar/toolbar.scss b/src/components/toolbar/toolbar.scss
index 248b65d2e..7a509054c 100644
--- a/src/components/toolbar/toolbar.scss
+++ b/src/components/toolbar/toolbar.scss
@@ -1,7 +1,7 @@
 $toolbar-background-color: #fff;
 
 .toolbar {
-  z-index: 3;
+  z-index: 4;
   height: $toolbar-height;
   cursor: auto;
   width: 100%;