diff --git a/CHANGELOG b/CHANGELOG
index 87088f07f..70d90e774 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -103,6 +103,11 @@
 - add document list which can be exported as an archive
 - search results can be exported
 
+--------------------------------------------------------------------------------
+                     Changes in version 5.1.8
+--------------------------------------------------------------------------------
+- fix javascript errors when an error page was shown
+
 --------------------------------------------------------------------------------
                      Changes in version 5.1.7
 --------------------------------------------------------------------------------
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index fb91a054d..142f05317 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1522,6 +1522,23 @@ $(document).ready(function() {
 
 	function exitError($pagetitle, $error, $noexit=false, $plain=false) { /* {{{ */
 
+		/* This is just a hack to prevent creation of js files in an error
+		 * case, because they will contain this error page again. It would be much
+		 * better, if there was extra error() function similar to show() and calling
+		 * $view() after setting the action to 'error'. This would also allow to
+		 * set separate error pages for each view.
+		 */
+		if(!$noexit) {
+			if(in_array($_REQUEST['action'], array('js', 'footerjs'))) {
+				exit;
+			}
+
+			if($_REQUEST['action'] == 'webrootjs') {
+				$this->webrootjs();
+				exit;
+			}
+		}
+
 		if(!$plain) {	
 			$this->htmlStartPage($pagetitle);
 			$this->globalNavigation();