diff --git a/src/canvas/index.js b/src/canvas/index.js
index 6a077b07b..ef3c38838 100644
--- a/src/canvas/index.js
+++ b/src/canvas/index.js
@@ -198,8 +198,8 @@ export default () => {
      * @return {HTMLElement}
      * @private
      */
-    getBadgeEl() {
-      return CanvasView.badgeEl;
+    getBadgeEl(compView) {
+      return this._getLocalEl(CanvasView.badgeEl, compView, 'getBadgeEl');
     },
 
     /**
diff --git a/src/canvas/view/FrameView.js b/src/canvas/view/FrameView.js
index 4aa9ea09b..00bb38d29 100644
--- a/src/canvas/view/FrameView.js
+++ b/src/canvas/view/FrameView.js
@@ -128,6 +128,10 @@ export default Backbone.View.extend({
     return this._getTool('[data-hl]');
   },
 
+  getBadgeEl() {
+    return this._getTool('[data-badge]');
+  },
+
   getOffsetViewerEl() {
     return this._getTool('[data-offset]');
   },
diff --git a/src/canvas/view/FrameWrapView.js b/src/canvas/view/FrameWrapView.js
index f4058acfc..531738710 100644
--- a/src/canvas/view/FrameWrapView.js
+++ b/src/canvas/view/FrameWrapView.js
@@ -61,7 +61,7 @@ export default Backbone.View.extend({
       },
       `
       <div class="${ppfx}highlighter" data-hl></div>
-      <div class="${ppfx}badge"></div>
+      <div class="${ppfx}badge" data-badge></div>
       <div class="${ppfx}placeholder">
         <div class="${ppfx}placeholder-int"></div>
       </div>
diff --git a/src/commands/view/SelectComponent.js b/src/commands/view/SelectComponent.js
index 1f5b66172..5eab15bbc 100644
--- a/src/commands/view/SelectComponent.js
+++ b/src/commands/view/SelectComponent.js
@@ -334,7 +334,7 @@ export default {
   updateBadge(el, pos, opts = {}) {
     const model = $(el).data('model');
     if (!model || !model.get('badgable')) return;
-    const badge = this.getBadge();
+    const badge = this.getBadge(opts);
 
     if (!opts.posOnly) {
       const config = this.canvas.getConfig();
@@ -637,8 +637,8 @@ export default {
    * @return {HTMLElement}
    * @private
    */
-  getBadge() {
-    return this.canvas.getBadgeEl();
+  getBadge(opts = {}) {
+    return this.canvas.getBadgeEl(opts.view);
   },
 
   /**
@@ -679,6 +679,7 @@ export default {
 
     this.updateBadge(el, pos, {
       ...badgeOpts,
+      view,
       topOff,
       leftOff
     });