diff --git a/templates/WidgetHolder.ss b/templates/WidgetHolder.ss
index b5cc19e5e..e6787fd56 100644
--- a/templates/WidgetHolder.ss
+++ b/templates/WidgetHolder.ss
@@ -1,4 +1,4 @@
-<div class="WidgetHolder">
-	<h3>$Title</h3>
+<div class="WidgetHolder $ClassName<% if FirstLast %> $FirstLast<% end_if %>">
+	<% if Title %><h3>$Title</h3><% end_if %>
 	$Content
-</div>
\ No newline at end of file
+</div>