diff --git a/src/dom_components/view/ComponentLabelView.js b/src/dom_components/view/ComponentLabelView.js
index fda67d77f..ead6161ad 100644
--- a/src/dom_components/view/ComponentLabelView.js
+++ b/src/dom_components/view/ComponentLabelView.js
@@ -1,3 +1,5 @@
 import ComponentLinkView from './ComponentLinkView';
 
-export default ComponentLinkView.extend({});
+export default ComponentLinkView.extend({
+  tagName: 'span' // Avoid Firefox bug with label editing #2332
+});