diff --git a/lms/static/coffee/src/discussion/discussion_module_view.coffee b/lms/static/coffee/src/discussion/discussion_module_view.coffee
index 2018518785..06ed320623 100644
--- a/lms/static/coffee/src/discussion/discussion_module_view.coffee
+++ b/lms/static/coffee/src/discussion/discussion_module_view.coffee
@@ -26,23 +26,23 @@ if Backbone?
           @showed = true
         else
           $elem = $(event.target)
-          discussion_id = $elem.attr("discussion_id")
-          url = DiscussionUtil.urlFor 'retrieve_discussion', discussion_id
+          discussionId = $elem.data("discussion-id")
+          url = DiscussionUtil.urlFor 'retrieve_discussion', discussionId
           DiscussionUtil.safeAjax
             $elem: $elem
             $loading: $elem
             url: url
             type: "GET"
             dataType: 'json'
-            success: (response, textStatus, jqXHR) => @createDiscussion(event, response, textStatus)
+            success: (response, textStatus, jqXHR) => @createDiscussion(event, response, textStatus, discussionId)
 
-    createDiscussion: (event, response, textStatus) =>
+    createDiscussion: (event, response, textStatus, discussionId) =>
       window.user = new DiscussionUser(response.user_info)
       Content.loadContentInfos(response.annotated_content_info)
       $(event.target).html("Hide Discussion")
       @discussion = new Discussion()
       @discussion.reset(response.discussion_data, {silent: false})
-      $discussion = $(Mustache.render $("script#_inline_discussion").html(), {'threads':response.discussion_data})
+      $discussion = $(Mustache.render $("script#_inline_discussion").html(), {'threads':response.discussion_data, 'discussionId': discussionId})
       $(".discussion-module").append($discussion)
       @newPostForm = $('.new-post-article')
       @threadviews = @discussion.map (thread) ->
diff --git a/lms/static/coffee/src/discussion/views/new_post_inline_vew.coffee b/lms/static/coffee/src/discussion/views/new_post_inline_vew.coffee
index f64454252c..044c61d40b 100644
--- a/lms/static/coffee/src/discussion/views/new_post_inline_vew.coffee
+++ b/lms/static/coffee/src/discussion/views/new_post_inline_vew.coffee
@@ -2,7 +2,7 @@ class @NewPostInlineView extends Backbone.View
 
   initialize: () ->
 
-    @topicId    = @$(".topic").first().data("discussion_id")
+    @topicId    = @$(".topic").first().data("discussion-id")
 
     @maxNameWidth = 100
 
diff --git a/lms/templates/discussion/_discussion_module.html b/lms/templates/discussion/_discussion_module.html
index fb3cda4a85..de4a9222e4 100644
--- a/lms/templates/discussion/_discussion_module.html
+++ b/lms/templates/discussion/_discussion_module.html
@@ -1,5 +1,5 @@
 <%include file="_underscore_templates.html" />
 
 <div class="discussion-module">
-    <a class="discussion-show control-button" href="javascript:void(0)" discussion_id="${discussion_id | h}">Show Discussion</a>
+    <a class="discussion-show control-button" href="javascript:void(0)" data-discussion-id="${discussion_id | h}">Show Discussion</a>
 </div>
diff --git a/lms/templates/discussion/mustache/_inline_discussion.mustache b/lms/templates/discussion/mustache/_inline_discussion.mustache
index a82e25ac51..8d55f9949b 100644
--- a/lms/templates/discussion/mustache/_inline_discussion.mustache
+++ b/lms/templates/discussion/mustache/_inline_discussion.mustache
@@ -1,7 +1,8 @@
-<section class="discussion">
+<section class="discussion" data-discussion-id="{{discussionId}}">
     <a href="#" class="new-post-btn"><span class="new-post-icon"></span>New Post</a>
 
     <article class="new-post-article">
+        <span class="topic"  data-discussion-id="{{discussionId}}" />
         <div class="inner-wrapper">
             <div class="new-post-form-errors">
             </div>