diff --git a/public/vendor/tagsinput/bootstrap-tagsinput.js b/public/vendor/tagsinput/bootstrap-tagsinput.js
index 4bc29ecbbdb..06f02c10712 100644
--- a/public/vendor/tagsinput/bootstrap-tagsinput.js
+++ b/public/vendor/tagsinput/bootstrap-tagsinput.js
@@ -358,6 +358,8 @@
       // Remove icon clicked
       self.$container.on('click', '[data-role=remove]', $.proxy(function(event) {
         self.remove($(event.target).closest('.tag').data('item'));
+        // Grafana mod, if tags input used in popover the click event will bubble up and hide popover
+        event.stopPropagation();
       }, self));
 
       // Only add existing value as tags when using strings as tags