diff --git a/src/panels/model/Button.js b/src/panels/model/Button.js
index 630c711d4..507ca0ee5 100644
--- a/src/panels/model/Button.js
+++ b/src/panels/model/Button.js
@@ -4,6 +4,7 @@ module.exports = Backbone.Model.extend({
   defaults: {
     id: '',
     label: '',
+    tagName: 'span',
     className: '',
     command: '',
     context: '',
diff --git a/src/panels/view/ButtonView.js b/src/panels/view/ButtonView.js
index 234589cf9..7e83ddc4c 100644
--- a/src/panels/view/ButtonView.js
+++ b/src/panels/view/ButtonView.js
@@ -3,7 +3,9 @@ import { isString, isObject, isFunction } from 'underscore';
 const $ = Backbone.$;
 
 module.exports = Backbone.View.extend({
-  tagName: 'span',
+  tagName() {
+    return this.model.get('tagName');
+  },
 
   events: {
     click: 'clicked'