diff --git a/app/controllers/dmsf_upload_controller.rb b/app/controllers/dmsf_upload_controller.rb
index 5ca043d7..e00d6eb2 100644
--- a/app/controllers/dmsf_upload_controller.rb
+++ b/app/controllers/dmsf_upload_controller.rb
@@ -41,6 +41,7 @@ class DmsfUploadController < ApplicationController
   end
 
   def upload_files
+    @wiki = Setting.text_formatting != 'HTML'
     uploaded_files = params[:dmsf_attachments]
     @uploads = []
     if uploaded_files
diff --git a/app/views/dmsf_files/_file_new_revision.html.erb b/app/views/dmsf_files/_file_new_revision.html.erb
index e063ac43..f7147ae5 100644
--- a/app/views/dmsf_files/_file_new_revision.html.erb
+++ b/app/views/dmsf_files/_file_new_revision.html.erb
@@ -97,4 +97,5 @@
 
 <% if wiki %>
   <%= wikitoolbar_for 'dmsf_file_revision_description' %>
+  <%= wikitoolbar_for 'dmsf_file_revision_comment' %>
 <% end %>
diff --git a/app/views/dmsf_upload/_upload_file.html.erb b/app/views/dmsf_upload/_upload_file.html.erb
index 6763818a..6aaafbcc 100644
--- a/app/views/dmsf_upload/_upload_file.html.erb
+++ b/app/views/dmsf_upload/_upload_file.html.erb
@@ -45,7 +45,8 @@
   </div>
   <p>
     <%= label_tag "commited_files[#{i}][description]", l(:label_description) %>
-    <%= text_area_tag "commited_files[#{i}][description]", upload.description, rows: 6, class: 'wiki-edit' %>
+    <%= text_area_tag "commited_files[#{i}][description]", upload.description, rows: 6,
+                      class: wiki ? 'wiki-edit' : 'dmsf-description' %>
   </p>
   <div class="clear">
     <div class="splitcontentright">
@@ -92,8 +93,12 @@
   </div>
   <p>
     <%= label_tag "commited_files[#{i}][comment]", l(:label_comment) %>
-    <%= text_area_tag "commited_files[#{i}][comment]", upload.comment, rows: 2, class: 'wiki-edit' %>
+    <%= text_area_tag "commited_files[#{i}][comment]", upload.comment, rows: 2,
+                      class: wiki ? 'wiki-edit' : 'dmsf-description' %>
   </p>
 </div>
 
-<%= wikitoolbar_for "commited_files_#{i}_description" %>
+<% if wiki %>
+  <%= wikitoolbar_for "commited_files_#{i}_description" %>
+  <%= wikitoolbar_for "commited_files_#{i}_comment" %>
+<% end %>
diff --git a/app/views/dmsf_upload/upload_files.html.erb b/app/views/dmsf_upload/upload_files.html.erb
index 220dd8d8..d6babffc 100644
--- a/app/views/dmsf_upload/upload_files.html.erb
+++ b/app/views/dmsf_upload/upload_files.html.erb
@@ -39,7 +39,7 @@
       <% if upload.locked %>
         <%= render partial: 'upload_file_locked', locals: { upload: upload, i: i } %>
       <% else %>
-        <%= render partial: 'upload_file', locals: { upload: upload, i: i } %>
+        <%= render partial: 'upload_file', locals: { upload: upload, i: i, wiki: @wiki } %>
       <% end %>
     <% end %>
     <div class="form-actions">