diff --git a/src/Menu/ArchiveLink.coffee b/src/Menu/ArchiveLink.coffee
index b5c6fe912..a2db55abc 100644
--- a/src/Menu/ArchiveLink.coffee
+++ b/src/Menu/ArchiveLink.coffee
@@ -18,6 +18,7 @@ ArchiveLink =
       ['Tripcode',  'tripcode']
       ['Capcode',   'capcode']
       ['Subject',   'subject']
+      ['Flag',      'country']
       ['Filename',  'filename']
       ['Image MD5', 'MD5']
     ]
@@ -37,7 +38,10 @@ ArchiveLink =
         true
     else
       (post) ->
-        value = Filter[type] post
+        value = if type is 'country'
+          post.info.flagCode
+        else
+          Filter[type] post
         # We want to parse the exact same stuff as the filter does already.
         return false unless value
         el.href = Redirect.to 'search',
diff --git a/src/classes/Post.coffee b/src/classes/Post.coffee
index 332144ec5..898004986 100644
--- a/src/classes/Post.coffee
+++ b/src/classes/Post.coffee
@@ -28,6 +28,7 @@ class Post
       tripcode:  @nodes.tripcode?.textContent
       uniqueID:  @nodes.uniqueID?.firstElementChild.textContent
       capcode:   @nodes.capcode?.textContent.replace '## ', ''
+      flagCode:  @nodes.flag?.className.match(/flag-(\w+)/)?[1].toUpperCase()
       flag:      @nodes.flag?.title
       date:      if @nodes.date then new Date(@nodes.date.dataset.utc * 1000)