diff --git a/view/templates/content_wrapper.tpl b/view/templates/content_wrapper.tpl
index b41871560..e323b12e1 100644
--- a/view/templates/content_wrapper.tpl
+++ b/view/templates/content_wrapper.tpl
@@ -1,9 +1,9 @@
 
 <div {{if $name}}id="{{$name}}-wrapper"{{/if}} class="general-content-wrapper">
 	{{* give different possibilities for the size of the heading *}}
-	{{if $title_size}}
+	{{if $title && $title_size}}
 		<h{{$title_size}} {{if $name}}id="{{$name}}-heading"{{/if}}>{{$title}}</h{{$title_size}}>
-	{{else}}
+	{{elseif $title}}
 	{{include file="section_title.tpl"}}
 	{{/if}}