diff --git a/templates/SilverStripe/Forms/FormAction.ss b/templates/SilverStripe/Forms/FormAction.ss
index 5cbea7633..a14c01820 100644
--- a/templates/SilverStripe/Forms/FormAction.ss
+++ b/templates/SilverStripe/Forms/FormAction.ss
@@ -1,6 +1,6 @@
 <% if $UseButtonTag %>
 	<button $AttributesHTML>
-		<% if $ButtonContent %>$ButtonContent<% else %>$Title.XML<% end_if %>
+		<% if $ButtonContent %>$ButtonContent<% else %><span>$Title.XML</span><% end_if %>
 	</button>
 <% else %>
 	<input $AttributesHTML />