diff --git a/resources/templates/dashboard/grid.twig b/resources/templates/dashboard/grid.twig
index 1064d98..4f4f979 100644
--- a/resources/templates/dashboard/grid.twig
+++ b/resources/templates/dashboard/grid.twig
@@ -41,9 +41,9 @@
                                         </a>
                                         <div class="overlay-rows-bottom pl-3 pr-3 pb-1">
                                             {% for tag_id, tag_name in media.tags %}
-                                                <a class="badge badge-pill badge-light shadow-sm tag-item mr-1" data-id="{{ tag_id }}" data-media="{{ media.id }}" title="{{ tag_name }}">{{ tag_name }}</a>
+                                                <a href="{{ queryParams({'tag':tag_id}) }}" class="badge badge-pill badge-light shadow-sm tag-item mr-1" data-id="{{ tag_id }}" data-media="{{ media.id }}" title="{{ tag_name }}">{{ tag_name }}</a>
                                             {% endfor %}
-                                            <a class="badge badge-pill badge-success shadow-sm tag-add mr-1" data-id="{{ media.id }}"><i class="fas fa-plus fa-sm fa-fw"></i></a>
+                                            <a href="javascript:void(0);" class="badge badge-pill badge-success shadow-sm tag-add mr-1" data-id="{{ media.id }}"><i class="fas fa-plus fa-sm fa-fw"></i></a>
                                         </div>
                                     </div>
                                 </div>
diff --git a/resources/templates/dashboard/list.twig b/resources/templates/dashboard/list.twig
index c08df3f..77332e2 100644
--- a/resources/templates/dashboard/list.twig
+++ b/resources/templates/dashboard/list.twig
@@ -44,7 +44,7 @@
                                                 <span class="text-maxlen">{{ media.filename }}</span>
                                                 <p>
                                                     {% for tag_id, tag_name in media.tags %}
-                                                        <a class="badge badge-pill badge-light shadow-sm tag-item mr-1" data-id="{{ tag_id }}" data-media="{{ media.id }}" title="{{ tag_name }}">{{ tag_name }}</a>
+                                                        <a href="{{ queryParams({'tag':tag_id}) }}" class="badge badge-pill badge-light shadow-sm tag-item mr-1" data-id="{{ tag_id }}" data-media="{{ media.id }}" title="{{ tag_name }}">{{ tag_name }}</a>
                                                     {% endfor %}
                                                     <a href="javascript:void(0)" class="badge badge-pill badge-success shadow-sm tag-add" data-id="{{ media.id }}"><i class="fas fa-plus fa-sm fa-fw"></i></a>
                                                 </p>
diff --git a/src/js/app.js b/src/js/app.js
index f14c979..4ae7f45 100644
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -174,6 +174,7 @@ var app = {
     },
     saveTag: function () {
         var tag = $(this).val();
+        var mediaId = $(this).data('id');
         var $parent = $(this).parent();
         if (tag === '') {
             $parent.remove();
@@ -182,7 +183,7 @@ var app = {
         $.ajax({
             type: 'POST',
             url: window.AppConfig.base_url + '/tag/add',
-            data: {'tag': tag, 'mediaId': $(this).data('id')},
+            data: {'tag': tag, 'mediaId': mediaId},
             dataType: 'json',
             success: function (data) {
                 if (!data.limitReached) {
@@ -190,7 +191,8 @@ var app = {
                         $(document.createElement('a'))
                             .addClass('badge badge-pill badge-light shadow-sm tag-item mr-1')
                             .attr('data-id', data.tagId)
-                            .dblclick(app.removeTag)
+                            .attr('data-media', mediaId)
+                            .contextmenu(app.removeTag)
                             .text(tag)
                     );
                 } else {