diff --git a/app/src/main/java/com/shaarit/presentation/feed/FeedViewModel.kt b/app/src/main/java/com/shaarit/presentation/feed/FeedViewModel.kt
index 1fc8f82..61f347f 100644
--- a/app/src/main/java/com/shaarit/presentation/feed/FeedViewModel.kt
+++ b/app/src/main/java/com/shaarit/presentation/feed/FeedViewModel.kt
@@ -194,7 +194,14 @@ class FeedViewModel @Inject constructor(
     fun togglePin(id: Int) {
         viewModelScope.launch {
             linkDao.getLinkById(id)?.let { link ->
-                linkDao.updatePinStatus(id, !link.isPinned)
+                val newPinned = !link.isPinned
+                val newTags = if (newPinned) {
+                    if ("shaarli-pin" !in link.tags) link.tags + "shaarli-pin" else link.tags
+                } else {
+                    link.tags - "shaarli-pin"
+                }
+                linkDao.updatePinStatus(id, newPinned)
+                linkDao.updateLinkTags(id, newTags)
                 _refreshTrigger.value++
             }
         }
diff --git a/app/src/main/java/com/shaarit/presentation/pinned/PinnedViewModel.kt b/app/src/main/java/com/shaarit/presentation/pinned/PinnedViewModel.kt
index 942252d..d01d660 100644
--- a/app/src/main/java/com/shaarit/presentation/pinned/PinnedViewModel.kt
+++ b/app/src/main/java/com/shaarit/presentation/pinned/PinnedViewModel.kt
@@ -32,7 +32,14 @@ class PinnedViewModel @Inject constructor(
     fun togglePin(id: Int) {
         viewModelScope.launch {
             linkDao.getLinkById(id)?.let { link ->
-                linkDao.updatePinStatus(id, !link.isPinned)
+                val newPinned = !link.isPinned
+                val newTags = if (newPinned) {
+                    if ("shaarli-pin" !in link.tags) link.tags + "shaarli-pin" else link.tags
+                } else {
+                    link.tags - "shaarli-pin"
+                }
+                linkDao.updatePinStatus(id, newPinned)
+                linkDao.updateLinkTags(id, newTags)
                 _refreshTrigger.value++
             }
         }
diff --git a/version.properties b/version.properties
index 5ccd8b3..2f994a7 100644
--- a/version.properties
+++ b/version.properties
@@ -1,3 +1,3 @@
-#Fri Feb 13 22:32:44 2026
-VERSION_NAME=2.1.6
-VERSION_CODE=21
\ No newline at end of file
+#Sat Feb 14 15:58:10 2026
+VERSION_NAME=2.1.7
+VERSION_CODE=22
\ No newline at end of file