diff --git a/app/assets/javascripts/discourse/controllers/topic_controller.js b/app/assets/javascripts/discourse/controllers/topic_controller.js
index ceef655d6d6..00ee4c59085 100644
--- a/app/assets/javascripts/discourse/controllers/topic_controller.js
+++ b/app/assets/javascripts/discourse/controllers/topic_controller.js
@@ -149,10 +149,11 @@ Discourse.TopicController = Discourse.ObjectController.extend(Discourse.Selected
       // save the modifications
       topic.save().then(function(result){
         // update the title if it has been changed (cleaned up) server-side
-        var title = result.basic_topic.fancy_title;
+        var title       = result.basic_topic.title;
+        var fancy_title = result.basic_topic.fancy_title;
         topic.setProperties({
           title: title,
-          fancy_title: title
+          fancy_title: fancy_title
         });
 
       }, function(error) {
diff --git a/app/serializers/basic_topic_serializer.rb b/app/serializers/basic_topic_serializer.rb
index 9a7cfb0baf2..5e2cf2c23ca 100644
--- a/app/serializers/basic_topic_serializer.rb
+++ b/app/serializers/basic_topic_serializer.rb
@@ -1,4 +1,4 @@
 # The most basic attributes of a topic that we need to create a link for it.
 class BasicTopicSerializer < ApplicationSerializer
-  attributes :id, :fancy_title, :slug, :posts_count
+  attributes :id, :title, :fancy_title, :slug, :posts_count
 end
diff --git a/app/serializers/listable_topic_serializer.rb b/app/serializers/listable_topic_serializer.rb
index c5718b31de9..3e5317a6839 100644
--- a/app/serializers/listable_topic_serializer.rb
+++ b/app/serializers/listable_topic_serializer.rb
@@ -13,7 +13,6 @@ class ListableTopicSerializer < BasicTopicSerializer
              :last_read_post_number,
              :unread,
              :new_posts,
-             :title,
              :pinned,
              :excerpt,
              :visible,