diff --git a/app/views/questions/_add_question.html.erb b/app/views/questions/_add_question.html.erb
index ae1617b..96b894f 100644
--- a/app/views/questions/_add_question.html.erb
+++ b/app/views/questions/_add_question.html.erb
@@ -26,7 +26,8 @@
       <!--Question text -->
       <tr>
         <td class="first_template"><%= _('Question text')%></td>
-        <td><%= f.text_area :text, rows: "5", id: "new_question_text_#{section.id}" %>
+        <td>
+          <%= text_area_tag('question[text]', "", id: "new_question_text_#{section.id}", class: "tinymce") %>
           <div class="border_bottom"></div>
         </td>
       </tr>
diff --git a/app/views/questions/_edit_question.html.erb b/app/views/questions/_edit_question.html.erb
index 919ff46..c46d932 100644
--- a/app/views/questions/_edit_question.html.erb
+++ b/app/views/questions/_edit_question.html.erb
@@ -20,7 +20,8 @@
       <!--Question text -->
       <tr>
         <td class="first_template"><%= _('Question text')%></td>
-        <td><%= f.text_area :text, rows: "5" %>
+        <td>
+          <%= f.text_area(:text, class: "tinymce") %>
           <div class="border_bottom"></div>
         </td>
       </tr>
diff --git a/lib/assets/javascripts/admin.js b/lib/assets/javascripts/admin.js
index 3e2ac45..4dc2829 100644
--- a/lib/assets/javascripts/admin.js
+++ b/lib/assets/javascripts/admin.js
@@ -145,7 +145,7 @@
     //if question text area is empty send alert
     $('.new_question_save_button').click(function(e){
         var s_id = $(this).prev(".section_id").val();
-        if ($('#new_question_text_'+ s_id).val() == ''){
+        if ($('#new_question_text_'+ s_id).tinymce().getContent() === ''){
             alert(__('Question text is empty, please enter your question.'));
             return false;
         }