diff --git a/js/watch.js b/js/watch.js
index bb69872a..e9d73890 100644
--- a/js/watch.js
+++ b/js/watch.js
@@ -259,13 +259,14 @@ $(function(){
     $('hr:first').before('<div id="watch-pin" style="text-align:right"><a class="unimportant" href="javascript:void(0)">-</a></div>');
     $('#watch-pin a').html(is_pinned(boardconfig) ? _("Unpin this board") : _("Pin this board")).click(function() {
       $(this).html(toggle_pinned(board) ? _("Unpin this board") : _("Pin this board"));
+      $('#watch-board a').html(is_boardwatched(boardconfig) ? _("Stop watching this board") : _("Watch this board"));
       update_pinned();
     });
 
     $('hr:first').before('<div id="watch-board" style="text-align:right"><a class="unimportant" href="javascript:void(0)">-</a></div>');
     $('#watch-board a').html(is_boardwatched(boardconfig) ? _("Stop watching this board") : _("Watch this board")).click(function() {
       $(this).html(toggle_boardwatched(board) ? _("Stop watching this board") : _("Watch this board"));
-      $('#watch-pin a').html(is_pinned(board) ? _("Unpin this board") : _("Pin this board"));
+      $('#watch-pin a').html(is_pinned(boardconfig) ? _("Unpin this board") : _("Pin this board"));
       update_pinned();
     });