diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/models/topic.js
index 538093642d6..4af79a69535 100644
--- a/app/assets/javascripts/discourse/models/topic.js
+++ b/app/assets/javascripts/discourse/models/topic.js
@@ -141,6 +141,14 @@ Discourse.Topic = Discourse.Model.extend({
     });
   },
 
+  favoriteTooltipKey: (function() {
+    return this.get('starred') ? 'favorite.help.unstar' : 'favorite.help.star';
+  }).property('starred'),
+
+  favoriteTooltip: (function() {
+    return Em.String.i18n(this.get('favoriteTooltipKey'));
+  }).property('favoriteTooltipKey'),
+
   toggleStar: function() {
     var topic = this;
     topic.toggleProperty('starred');
diff --git a/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars b/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars
index d651cf94e5e..0f66a1c4fd1 100644
--- a/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars
@@ -1,7 +1,7 @@
 
   {{#if Discourse.currentUser.id}}
     <td class='star'>
-      <a {{bindAttr class=":star :icon-star starred:starred"}} {{action toggleStar this target="controller"}} href='#' title='{{i18n favorite.help}}'></a>
+      <a {{bindAttr class=":star :icon-star starred:starred"}} {{action toggleStar this target="controller"}} href='#' {{bindAttr title="favoriteTooltip"}}></a>
     </td>
   {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/topic.js.handlebars b/app/assets/javascripts/discourse/templates/topic.js.handlebars
index de7bbb5f133..01b9f4dbb88 100644
--- a/app/assets/javascripts/discourse/templates/topic.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/topic.js.handlebars
@@ -6,7 +6,7 @@
       <div class='container'>
         <div class='inner'>
           {{#if view.showFavoriteButton}}
-            <a {{bindAttr class=":star view.topic.starred:starred"}} {{action toggleStar target="controller"}} href='#' title="{{i18n favorite.help}}"></a>
+            <a {{bindAttr class=":star view.topic.starred:starred"}} {{action toggleStar target="controller"}} href='#' {{bindAttr title="favoriteTooltip"}}></a>
           {{/if}}
           {{#if view.editingTopic}}
             <input id='edit-title' type='text' {{bindAttr value="view.topic.title"}} autofocus>
diff --git a/app/assets/javascripts/discourse/templates/topic_extra_info.js.handlebars b/app/assets/javascripts/discourse/templates/topic_extra_info.js.handlebars
index 8809fa5a70e..3880b9421b1 100644
--- a/app/assets/javascripts/discourse/templates/topic_extra_info.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/topic_extra_info.js.handlebars
@@ -1,5 +1,5 @@
 {{#if view.showFavoriteButton}}
-  <a {{bindAttr class=":star view.topic.starred:starred"}} {{action toggleStar target="controller"}} href='#' title="{{i18n favorite.help}}"></a>
+  <a {{bindAttr class=":star view.topic.starred:starred"}} {{action toggleStar target="controller"}} href='#' {{bindAttr title="view.topic.favoriteTooltip"}}></a>
 {{/if}}
 
 <h1>
diff --git a/app/assets/javascripts/discourse/views/topic_footer_buttons_view.js b/app/assets/javascripts/discourse/views/topic_footer_buttons_view.js
index a68ee7ca4c1..ae4002e6993 100644
--- a/app/assets/javascripts/discourse/views/topic_footer_buttons_view.js
+++ b/app/assets/javascripts/discourse/views/topic_footer_buttons_view.js
@@ -40,7 +40,7 @@ Discourse.TopicFooterButtonsView = Ember.ContainerView.extend({
 
         this.addObject(Discourse.ButtonView.createWithMixins({
           textKey: 'favorite.title',
-          helpKey: 'favorite.help',
+          helpKeyBinding: 'controller.content.favoriteTooltipKey',
 
           favoriteChanged: (function() {
             this.rerender();
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 824057c8b75..381c2254d92 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -357,7 +357,9 @@ en:
 
     favorite:
       title: 'Favorite'
-      help: 'add this topic to your favorites list'
+      help:
+        star: 'add this topic to your favorites list'
+        unstar: 'remove this topic from your favorites list'
 
     topics:
       none:
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 6078af333d9..03f9cee4d64 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -361,7 +361,9 @@ fr:
 
     favorite:
       title: 'Favoris'
-      help: 'ajouter cette discussion à vos favoris'
+      help:
+        star: 'ajouter cette discussion à vos favoris'
+        unstar: 'enlever cette discussion de vos favoris'
 
     topics:
       none: