diff --git a/lib/gollum/frontend/public/gollum/livepreview/js/livepreview/livepreview.js b/lib/gollum/frontend/public/gollum/livepreview/js/livepreview/livepreview.js
index 2dcff06d..c8926ab3 100644
--- a/lib/gollum/frontend/public/gollum/livepreview/js/livepreview/livepreview.js
+++ b/lib/gollum/frontend/public/gollum/livepreview/js/livepreview/livepreview.js
@@ -70,6 +70,8 @@ defaultCommitMessage = function() {
 commentEditorSession.setValue( defaultCommitMessage() );
 
 $.save = function( commitMessage ) {
+  window.onbeforeunload = null;
+
   var POST = "POST";
   var markdown = "markdown";
   var txt = editorSession.getValue();
diff --git a/lib/gollum/frontend/templates/create.mustache b/lib/gollum/frontend/templates/create.mustache
index 64dbabde..0fd92af2 100644
--- a/lib/gollum/frontend/templates/create.mustache
+++ b/lib/gollum/frontend/templates/create.mustache
@@ -10,6 +10,8 @@
 </div>
 <script type="text/javascript">
 window.onbeforeunload = function(){ return "Leaving will not create a new page!" };
+$("#gollum-editor-submit").click( window.onbeforeunload = null; );
+
 jQuery(document).ready(function() {
   $.GollumEditor({ NewFile: true, MarkupType: '{{default_markup}}' });
 });
diff --git a/lib/gollum/frontend/templates/edit.mustache b/lib/gollum/frontend/templates/edit.mustache
index 527eaa83..d6efce1a 100644
--- a/lib/gollum/frontend/templates/edit.mustache
+++ b/lib/gollum/frontend/templates/edit.mustache
@@ -12,6 +12,8 @@
 </div>
 <script type="text/javascript">
 window.onbeforeunload = function(){ return "Leaving will discard all edits!" };
+$("#gollum-editor-submit").click( window.onbeforeunload = null; );
+
 jQuery(document).ready(function() {
   $.GollumEditor();
 });