diff --git a/app/views/common/_markup.html.erb b/app/views/common/_markup.html.erb
index dc6c7f474..14786a87c 100644
--- a/app/views/common/_markup.html.erb
+++ b/app/views/common/_markup.html.erb
@@ -1,3 +1,3 @@
-<div class="wiki">
+<div class="filecontent wiki">
   <%= Redmine::WikiFormatting.to_html(markup_text_formatting, Redmine::CodesetUtil.to_utf8_by_setting(markup_text)).html_safe %>
 </div>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 5f8ade106..28465feb4 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1740,6 +1740,13 @@ img {
   max-width: 100%;
 }
 
+.filecontent-container > .filecontent.wiki {
+  position: relative;
+  padding: 1em;
+  border: 1px solid #e4e4e4;
+  border-radius: 3px;
+}
+
 /* Fixes for IE 11 */
 @media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
   select::-ms-expand {