diff --git a/templates/Froxlor/assets/js/main.js b/templates/Froxlor/assets/js/main.js
index bd2ba156..345fb6ef 100644
--- a/templates/Froxlor/assets/js/main.js
+++ b/templates/Froxlor/assets/js/main.js
@@ -1,4 +1,9 @@
 $(document).ready(function() {
+	$('#historyback').click(function() {
+		parent.history.back();
+		return false;
+	});
+	
 	// this is necessary for the special setting feature (ref #1010)
 	$.getQueryVariable = function(key) {
 		var urlParams = decodeURI( window.location.search.substring(1) );
diff --git a/templates/Froxlor/misc/dberrornice.tpl b/templates/Froxlor/misc/dberrornice.tpl
index 21a9c1c9..72458523 100644
--- a/templates/Froxlor/misc/dberrornice.tpl
+++ b/templates/Froxlor/misc/dberrornice.tpl
@@ -32,7 +32,7 @@
 				</div>
 			</div>
 			<p class="submit">
-				<a href="javascript:history.go(-1)" title="Click here to go back">Go back</a>
+				<a href="#" title="Click here to go back" id="historyback">Go back</a>
 			</p>
 		</section>
 
diff --git a/templates/Sparkle/assets/js/main.js b/templates/Sparkle/assets/js/main.js
index a8bd3f97..ff662642 100644
--- a/templates/Sparkle/assets/js/main.js
+++ b/templates/Sparkle/assets/js/main.js
@@ -19,6 +19,11 @@ $(document).ready(function() {
 		$("html, body").animate({ scrollTop: 0 }, 600);
 		return false;
 	});
+	
+	$('#historyback').click(function() {
+		parent.history.back();
+		return false;
+	});
 
 	// this is necessary for the special setting feature (ref #1010)
 	$.getQueryVariable = function(key) {
diff --git a/templates/Sparkle/misc/dberrornice.tpl b/templates/Sparkle/misc/dberrornice.tpl
index 454f601a..60cb7038 100644
--- a/templates/Sparkle/misc/dberrornice.tpl
+++ b/templates/Sparkle/misc/dberrornice.tpl
@@ -35,7 +35,7 @@
 				</div>
 			</div>
 			<aside class="right">
-				<a href="javascript:history.go(-1)" title="Click here to go back">Go back</a>
+				<a href="#" title="Click here to go back" id="historyback">Go back</a>
 			</aside>
 		</section>