diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c77d3f34..70550aec 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,8 @@ Current
 -------
 
 - **BREAKING**: the *single* and *version* options within the ``[Global]`` section have been removed in favor of a new unified *backend* option
+- Fix: issue `#268 <https://git.ziirish.me/ziirish/burp-ui/issues/268>`_
+- `Full changelog <https://git.ziirish.me/ziirish/burp-ui/compare/0.6.0...master>`__
 
 0.6.1 (05/17/2018)
 ------------------
@@ -12,7 +14,7 @@ Current
 - Improvement: Don't cache any data when there is a running backup
 - Fix: cannot display bui-agent version
 - Fix: live-monitor was broken do to a missing cache
-- `Full changelog <https://git.ziirish.me/ziirish/burp-ui/compare/0.6.0...master>`__
+- `Full changelog <https://git.ziirish.me/ziirish/burp-ui/compare/0.6.0...0.6.1>`__
 
 0.6.0 (05/14/2018)
 ------------------
diff --git a/burpui/templates/js/client-browse.js b/burpui/templates/js/client-browse.js
index 64a4f09b..57dac09a 100644
--- a/burpui/templates/js/client-browse.js
+++ b/burpui/templates/js/client-browse.js
@@ -159,7 +159,9 @@ $( document ).ready(function() {
 		}
 	};
 
-	toggleRestorationForms(tree);
+	$('#tree').on('fancytreeinit', function() {
+		toggleRestorationForms(tree);
+	});
 
 	$("input[name=search-tree]").keyup(function(e){
 		var n,
diff --git a/burpui/templates/js/client.js b/burpui/templates/js/client.js
index c0d11020..bb3ff903 100644
--- a/burpui/templates/js/client.js
+++ b/burpui/templates/js/client.js
@@ -108,7 +108,7 @@ var _client_table = $('#table-client').DataTable( {
 				if (type === 'filter' || type === 'sort') {
 					return data.number;
 				}
-				return '<a href="{{ url_for("view.client_browse", name=cname, server=server) }}/'+data.number+(data.encrypted?'&encrypted=1':'')+'" style="color: inherit; text-decoration: inherit;">'+pad(data.number, 7)+'</a>';
+				return '<a href="{{ url_for("view.client_browse", name=cname, server=server) }}/'+data.number+(data.encrypted?'?encrypted=1':'')+'" style="color: inherit; text-decoration: inherit;">'+pad(data.number, 7)+'</a>';
 			}
 		},
 		{
@@ -160,19 +160,6 @@ var _client_table = $('#table-client').DataTable( {
 var first = true;
 
 var _client = function() {
-	if (!__init_complete) {
-		return;
-	}
-	if (first) {
-		first = false;
-	} else {
-		if (!AJAX_CACHE) {
-			_cache_id = new Date().getTime();
-		}
-		_client_table.ajax.reload( null, false );
-		AJAX_CACHE = true;
-	}
-
 	url_restore = '{{ url_for("api.is_server_restore", name=cname, server=server) }}';
 	$.getJSON(url_restore, function(d) {
 		if (d.found) {
@@ -200,6 +187,19 @@ var _client = function() {
 	}).fail(function() {
 		$('#controls').hide();
 	});
+
+	if (!__init_complete) {
+		return;
+	}
+	if (first) {
+		first = false;
+	} else {
+		if (!AJAX_CACHE) {
+			_cache_id = new Date().getTime();
+		}
+		_client_table.ajax.reload( null, false );
+		AJAX_CACHE = true;
+	}
 };
 
 {{ macros.page_length('#table-client') }}