diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index bd0da6354..220e326ed 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -382,6 +382,9 @@ $(document).ready( function() {
 		});
 	});
 
+	$('button.history-back').on('click', function(event) {
+		window.history.back();
+	});
 });
 
 function onAddClipboard(ev) { /* {{{ */
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 90580d2ee..7082cae33 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1195,7 +1195,7 @@ $('#clearfilename<?php print $formName ?>').click(function(ev) {
 		print "<h4>".getMLText('error')."!</h4>";
 		print htmlspecialchars($error);
 		print "</div>";
-		print "<div><button class=\"btn\" onclick=\"window.history.back();\">".getMLText('back')."</button></div>";
+		print "<div><button class=\"btn history-back\">".getMLText('back')."</button></div>";
 		
 		$this->contentEnd();
 		$this->htmlEndPage();