diff --git a/lib/gollum/frontend/app.rb b/lib/gollum/frontend/app.rb
index ace37248..c4742705 100644
--- a/lib/gollum/frontend/app.rb
+++ b/lib/gollum/frontend/app.rb
@@ -147,7 +147,7 @@ module Precious
 
     post '/preview' do
       wiki     = Gollum::Wiki.new(settings.gollum_path, settings.wiki_options)
-      @name    = "Preview"
+      @name    = params[:page] || "Preview"
       @page    = wiki.preview_page(@name, params[:content], params[:format])
       @content = @page.formatted_data
       @toc_content = wiki.universal_toc ? @page.toc_data : nil
diff --git a/lib/gollum/frontend/public/gollum/javascript/editor/gollum.editor.js b/lib/gollum/frontend/public/gollum/javascript/editor/gollum.editor.js
index 0ef3d2a5..8dee8aef 100755
--- a/lib/gollum/frontend/public/gollum/javascript/editor/gollum.editor.js
+++ b/lib/gollum/frontend/public/gollum/javascript/editor/gollum.editor.js
@@ -64,6 +64,8 @@
           var $form = $($('#gollum-editor form').get(0));
           $form.attr('action', this.href || '/preview');
           $form.attr('target', '_blank');
+          var paths = window.location.pathname.split('/');
+          $form.attr('page', paths[ paths.length - 1 ] || '')
           $form.submit();