diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index b45acfff2..ab433cfeb 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -163,6 +163,15 @@ console.log("location: " + document.location + ", state: " + JSON.stringify(even
 console.log(JSON.stringify(event.state));
   window.location = document.location;
 };
+/* catch click on 'goto parent button' */
+$('body').on('click', '#goto-parent', function(ev) {
+	attr_id = $(ev.currentTarget).data('parentid');
+	folderSelected(attr_id, '');
+	$([document.documentElement, document.body]).animate({
+	scrollTop: 200
+	}, 200);
+});
+/* catch click on a folder row in the list folders and documents */
 $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev) {
 	attr_id = $(ev.currentTarget).parent().attr('id').split('-')[3];
 	folderSelected(attr_id, '');
@@ -170,6 +179,7 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 	scrollTop: 200
 	}, 200);
 });
+/* catch click on a document row in the list folders and documents */
 $('body').on('click', '[id^=\"table-row-document\"] td:nth-child(2)', function(ev) {
 	attr_id = $(ev.currentTarget).parent().attr('id').split('-')[3];
 	window.location = '../out/out.ViewDocument.php?documentid=' + attr_id;
@@ -326,7 +336,7 @@ $('body').on('click', '.order-btn', function(ev) {
 			else {
 				print "<table id=\"viewfolder-table\" class=\"table table-condensed table-hover\">";
 				print "<thead>\n<tr>\n";
-				print "<th>".($parent ? '<button class="btn btn-mini btn-default" id="table-row-folder-'.$parent->getID().'"><i class="icon-arrow-up"></i></button>' : '')."</th>\n";	
+				print "<th>".($parent ? '<button class="btn btn-mini btn-default" id="goto-parent" data-parentid="'.$parent->getID().'"><i class="icon-arrow-up"></i></button>' : '')."</th>\n";	
 				print "<th>".getMLText("name");
 				print " <a class=\"order-btn\" href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="n"||$orderby=="na"?"&orderby=nd":"&orderby=n")."\" data-orderby=\"".($orderby=="n"||$orderby=="na"?"nd":"n")."\"title=\"".getMLText("sort_by_name")."\">".($orderby=="n"||$orderby=="na"?' <i class="icon-sort-by-alphabet selected"></i>':($orderby=="nd"?' <i class="icon-sort-by-alphabet-alt selected"></i>':' <i class="icon-sort-by-alphabet"></i>'))."</a>";
 				print " <a class=\"order-btn\" href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="s"||$orderby=="sa"?"&orderby=sd":"&orderby=s")."\" data-orderby=\"".($orderby=="s"||$orderby=="sa"?"sd":"s")."\" title=\"".getMLText("sort_by_sequence")."\">".($orderby=="s"||$orderby=="sa"?' <i class="icon-sort-by-order selected"></i>':($orderby=="sd"?' <i class="icon-sort-by-order-alt selected"></i>':' <i class="icon-sort-by-order"></i>'))."</a>";