diff --git a/lib/gollum/templates/wiki_content.mustache b/lib/gollum/templates/wiki_content.mustache
index 31e42d14..e096bb15 100644
--- a/lib/gollum/templates/wiki_content.mustache
+++ b/lib/gollum/templates/wiki_content.mustache
@@ -11,12 +11,12 @@
 	  {{/has_toc}}
 	  {{#has_sidebar}}
 	  <div id="wiki-sidebar" class="gollum-{{sidebar_format}}-content">
-	    <div id="sidebar-content" class="Box Box--condensed col-3 markdown-body pl-4 float-right">
+	    <div id="sidebar-content" class="Box Box--condensed col-3 markdown-body px-4 float-{{bar_side}}">
 	      {{{sidebar_content}}}
 	    </div>
 	  </div>
 	  {{/has_sidebar}}
-	  <div id="wiki-body" class="gollum-{{format}}-content">
+	  <div id="wiki-body" class="gollum-{{format}}-content overflow-hidden {{#left_bar}}pl-4{{/left_bar}}">
 	    {{#has_header}}
 	    <div id="wiki-header" class="gollum-{{header_format}}-content">
 	      <div id="header-content" class="markdown-body">
diff --git a/lib/gollum/views/page.rb b/lib/gollum/views/page.rb
index c9ab403f..c992db2f 100644
--- a/lib/gollum/views/page.rb
+++ b/lib/gollum/views/page.rb
@@ -122,6 +122,10 @@ module Precious
       def bar_side
         @bar_side.to_s
       end
+      
+      def left_bar
+        @bar_side == :left
+      end
 
       def has_sidebar
         if @sidebar