diff --git a/view/theme/frio/templates/jot-header.tpl b/view/theme/frio/templates/jot-header.tpl
index 8eb76ccc6..bc5b20888 100644
--- a/view/theme/frio/templates/jot-header.tpl
+++ b/view/theme/frio/templates/jot-header.tpl
@@ -56,7 +56,6 @@
 			jotTextOpenUI(document.getElementById("profile-jot-text"));
 		});
 
-
 		/* show images / file browser window
 		 *
 		 **/
@@ -125,6 +124,24 @@
 			Dialog.doFileBrowser("main");
 			jotActive();
 		});
+
+		$('body').on('click', '.p-category .filerm', function(e){
+			e.preventDefault();
+
+			let $href = $(e.target).attr('href');
+			// Prevents arbitrary Ajax requests
+			if ($href.substr(0, 7) === 'filerm/') {
+				$(e.target).parent().removeClass('btn-success btn-danger');
+				$.post($href)
+				.done(function() {
+					liking = 1;
+					force_update = true;
+				})
+				.always(function () {
+					NavUpdate();
+				});
+			}
+		});
 	});
 
 	function deleteCheckedItems() {
@@ -281,7 +298,6 @@
 				return false;
 			});
 		});
-
 	}
 
 	function jotClearLocation() {
diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 12b12a2e7..4f2d7e1bc 100644
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -278,12 +278,12 @@ as the value of $top_child_total (this is done at the end of this file)
 				<span class="mention label label-default sm">{{$tag nofilter}} <i class="fa fa-eye-slash" aria-hidden="true"></i></span>
 			{{/foreach*}}
 		{{/if}}
-			{{foreach $item.folders as $cat}}
-				<span class="folder label btn-danger sm p-category">{{$cat.name}}{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+			{{foreach $item.folders as $folder}}
+				<span class="folder label btn-danger sm p-category">{{$folder.name}}{{if $folder.removeurl}} (<a href="{{$folder.removeurl}}" class="filerm" title="{{$remove}}">x</a>){{/if}}</span>
 			{{/foreach}}
 
 			{{foreach $item.categories as $cat}}
-				<span class="category label btn-success sm p-category"><a href="{{$cat.url}}">{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+				<span class="category label btn-success sm p-category"><a href="{{$cat.url}}">{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" class="filerm" title="{{$remove}}">x</a>){{/if}}</span>
 			{{/foreach}}
 			</div>
 			{{if $item.edited}}<div class="itemedited text-muted">{{$item.edited['label']}} (<span title="{{$item.edited['date']}}">{{$item.edited['relative']}}</span>)</div>{{/if}}