diff --git a/src/knockout/templates/question.html b/src/knockout/templates/question.html
index f709828fb8..98a0616081 100644
--- a/src/knockout/templates/question.html
+++ b/src/knockout/templates/question.html
@@ -10,8 +10,13 @@
   <!-- /ko -->
   <!-- ko component: { name: question.survey.getQuestionContentWrapperComponentName(question), params: { componentData:  question.survey.getElementWrapperComponentData(question), templateData: { name: 'survey-question-content', data: question } } } -->
   <!-- /ko -->
+  <!-- ko if: question.hasTitleOnBottom -->
+    <!--ko template: { name: 'survey-question-title', data: question  } -->
+    <!-- /ko -->
+  <!-- /ko -->
   <!-- ko if: question.showErrorsBelowQuestion -->
     <!-- ko template: { name: 'survey-question-errors', data: question } -->
     <!-- /ko -->
   <!-- /ko -->
-  </script>
+</div>
+</script>
diff --git a/src/knockout/templates/questioncontent.html b/src/knockout/templates/questioncontent.html
index 51467398cf..88bba0bf6f 100644
--- a/src/knockout/templates/questioncontent.html
+++ b/src/knockout/templates/questioncontent.html
@@ -1,40 +1,36 @@
 <script type="text/html" id="survey-question-content">
 <div data-bind="visible: !question.isCollapsed, css: question.cssContent, event: {focusin: question.focusIn }" role="presentation">
-    <!-- ko if: question.showErrorOnTop -->
-      <!-- ko template: { name: 'survey-question-errors', data: question } -->
-      <!-- /ko -->
+  <!-- ko if: question.showErrorOnTop -->
+    <!-- ko template: { name: 'survey-question-errors', data: question } -->
     <!-- /ko -->
-    <!-- ko if: question.isDefaultRendering() -->
-      <!-- ko template: { name: question.koTemplateName(), data: question, afterRender: question.koQuestionAfterRender } -->
-      <!-- /ko -->
+  <!-- /ko -->
+  <!-- ko if: question.isDefaultRendering() -->
+    <!-- ko template: { name: question.koTemplateName(), data: question, afterRender: question.koQuestionAfterRender } -->
     <!-- /ko -->
-    <!-- ko ifnot: question.isDefaultRendering() -->
-      <!-- ko component: { name: getComponentName(), params: { question: question } } -->
-      <!-- /ko -->
+  <!-- /ko -->
+  <!-- ko ifnot: question.isDefaultRendering() -->
+    <!-- ko component: { name: getComponentName(), params: { question: question } } -->
     <!-- /ko -->
-    <!-- ko if: question.hasComment -->
-    <div data-bind="css: question.getCommentAreaCss()">
-      <div>
-        <!-- ko template: { name: 'survey-string', data: question.locCommentText } -->
-        <!-- /ko -->
-      </div>
-      <!-- ko template: { name: 'survey-comment',  data: {'question': question, 'visible': true } } -->
+  <!-- /ko -->
+  <!-- ko if: question.hasComment -->
+  <div data-bind="css: question.getCommentAreaCss()">
+    <div>
+      <!-- ko template: { name: 'survey-string', data: question.locCommentText } -->
       <!-- /ko -->
     </div>
+    <!-- ko template: { name: 'survey-comment',  data: {'question': question, 'visible': true } } -->
     <!-- /ko -->
-    <!-- ko if: question.showErrorOnBottom -->
-      <!-- ko template: { name: 'survey-question-errors', data: question } -->
-      <!-- /ko -->
-    <!-- /ko -->
-    <!-- ko if: question.hasDescriptionUnderInput -->
-    <div data-bind="css: cssClasses.descriptionUnderInput">
-      <!-- ko template: { name: 'survey-string', data: locDescription } -->
-      <!-- /ko -->
-    </div>
+  </div>
+  <!-- /ko -->
+  <!-- ko if: question.showErrorOnBottom -->
+    <!-- ko template: { name: 'survey-question-errors', data: question } -->
     <!-- /ko -->
-    <!-- ko if: question.hasTitleOnBottom -->
-      <!--ko template: { name: 'survey-question-title', data: question  } -->
-      <!-- /ko -->
+  <!-- /ko -->
+  <!-- ko if: question.hasDescriptionUnderInput -->
+  <div data-bind="css: cssClasses.descriptionUnderInput">
+    <!-- ko template: { name: 'survey-string', data: locDescription } -->
     <!-- /ko -->
   </div>
+  <!-- /ko -->
+</div>
 </script>
\ No newline at end of file