diff --git a/lib/gollum/frontend/templates/editor.mustache b/lib/gollum/frontend/templates/editor.mustache
index b5dd5d6d..81c8d2d6 100755
--- a/lib/gollum/frontend/templates/editor.mustache
+++ b/lib/gollum/frontend/templates/editor.mustache
@@ -86,21 +86,21 @@
     <textarea id="gollum-editor-body"
      data-markup-lang="{{format}}" name="content">{{content}}</textarea>
      
-    {{#has_footer}}
+    {{#footer}}
     <div id="gollum-editor-edit-footer" class="collapsed">
       <a href="#" class="button"><span>Expand/Collapse</span></a>
       <h4>Footer</h4>
-      <textarea id="gollum-editor-footer" name="footer"></textarea>
+      <textarea id="gollum-editor-footer" name="footer">{{footer}}</textarea>
     </div>
-    {{/has_footer}}
+    {{/footer}}
     
-    {{#has_sidebar}}
+    {{#sidebar}}
     <div id="gollum-editor-edit-sidebar" class="collapsed">
       <a href="#" class="button"><span>Expand/Collapse</span></a>
       <h4>Sidebar</h4>
-      <textarea id="gollum-editor-sidebar" name="sidebar"></textarea>
+      <textarea id="gollum-editor-sidebar" name="sidebar">{{sidebar}}</textarea>
     </div>
-    {{/has_sidebar}}
+    {{/sidebar}}
     
     <div id="gollum-editor-edit-summary" class="singleline">
       <label for="message" class="jaws">Edit message:</label>
diff --git a/lib/gollum/frontend/views/edit.rb b/lib/gollum/frontend/views/edit.rb
index 44392a22..21078dbc 100755
--- a/lib/gollum/frontend/views/edit.rb
+++ b/lib/gollum/frontend/views/edit.rb
@@ -5,37 +5,48 @@ module Precious
 
       attr_reader :page, :content
 
+      def title
+        "#{@page.title}"
+      end
+
       def page_name
         @name.gsub('-', ' ')
       end
 
+      def footer
+        if @footer.nil?
+          if page = @page.footer
+            @footer = page.raw_data
+          else
+            @footer = false
+          end
+        end
+        @footer
+      end
+
+      def sidebar
+        if @sidebar.nil?
+          if page = @page.sidebar
+            @sidebar = page.raw_data
+          else
+            @sidebar = false
+          end
+        end
+        @sidebar
+      end
+
       def is_create_page
         false
       end
-      
+
       def is_edit_page
         true
       end
-        
+
       def format
         @format = (@page.format || false) if @format.nil?
         @format.to_s.downcase
       end
-    
-      def has_footer 
-        @footer = (@page.footer || false) if @footer.nil?
-        !!@footer
-      end
-        
-      def has_sidebar
-        @sidebar = (@page.sidebar || false) if @sidebar.nil?
-        !!@sidebar
-      end
-
-      def title
-        "#{@page.title}"
-      end
-      
     end
   end
 end