diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 625a1882e..507dada24 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -228,6 +228,12 @@ class TagsController < ApplicationController
         @select_tag_name = params[:select_tag_name]
       end
 
+      if @obj && @object_flag == '6' && @obj.container.kind_of?(Project)
+        @project = @obj.container
+        @tag_list = get_course_tag_list @project
+        @select_tag_name = params[:select_tag_name]
+      end
+
       if @obj && @object_flag == '6' && @obj.container.kind_of?(OrgSubfield)
         @org_subfield = @obj.container
         @tag_list = get_org_subfield_tag_list @org_subfield
@@ -540,6 +546,10 @@ class TagsController < ApplicationController
       @course = @obj.container
       @tag_list = @tag_list = get_course_tag_list @course
     end
+    if @obj && @obj_flag == '6' && @obj.container.kind_of?(Project)
+      @project = @obj.container
+      @tag_list = @tag_list = get_project_tag_list @project
+    end
     if @obj && @obj_flag == '6' && @obj.container.kind_of?(OrgSubfield)
       @org_subfield = @obj.container
       @tag_list = @tag_list = get_org_subfield_tag_list @org_subfield
diff --git a/app/views/files/_project_file.html.erb b/app/views/files/_project_file.html.erb
index 7e0c1655c..88c30e1b7 100644
--- a/app/views/files/_project_file.html.erb
+++ b/app/views/files/_project_file.html.erb
@@ -70,7 +70,7 @@
       <% end %>
     </div>
     <div>
-      <div class="fileTagWrap" id="files_tag">
+      <div class="fileTagWrap" id="files_tag_project">
         <%= render :partial => "files/tag_yun_project", :locals => {:tag_list => @tag_list,:project => @project, :tag_name => @tag_name}%>
       </div>
       <div class="cl"></div>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index b5276c388..6716a3aaa 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -12,7 +12,7 @@
   <%= favicon %>
   <%= javascript_heads %>
   <%= heads_for_theme %>
-  <%= stylesheet_link_tag 'public', 'pleft', 'project','prettify','course','jquery/jquery-ui-1.9.2','header','repository' %>
+  <%= stylesheet_link_tag 'public', 'pleft', 'project','prettify','jquery/jquery-ui-1.9.2','header','repository' %>
   <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','attachments' %>
 
   <%= call_hook :view_layouts_base_html_head %>
diff --git a/app/views/tags/remove_tag_new.js.erb b/app/views/tags/remove_tag_new.js.erb
index 879155aa7..0cbe2fc41 100644
--- a/app/views/tags/remove_tag_new.js.erb
+++ b/app/views/tags/remove_tag_new.js.erb
@@ -5,6 +5,8 @@ $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render
                      :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @object_flag,:select_tag_name => @select_tag_name}) %>');
 <% if @org_subfield %>
     $("#files_tag").html("<%= escape_javascript(render :partial => "files/subfield_tags", :locals => {:tag_list => @tag_list,:org_subfield => @org_subfield,:tag_name => @tag_name})%>");
+<% elsif @project %>
+    $("#files_tag_project").html("<%= escape_javascript(render :partial => "files/tag_yun_project", :locals => {:tag_list => @tag_list,:project => @project,:tag_name => @select_tag_name}) %>");
 <% else %>
     $("#files_tag").html("<%= escape_javascript(render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => @course,:tag_name => @select_tag_name}) %>");
 <% end %>
diff --git a/app/views/tags/tag_save.js.erb b/app/views/tags/tag_save.js.erb
index bd0c3b16b..e4f12b558 100644
--- a/app/views/tags/tag_save.js.erb
+++ b/app/views/tags/tag_save.js.erb
@@ -21,6 +21,7 @@ $('#tags_name2').val("");
     <%elsif @project%>
         $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
         $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").replaceWith('<%= escape_javascript(render :partial => 'tags/tag_new', :locals => {:obj => @obj, :object_flag => "6"}) %>');
+        $("#files_tag_project").html("<%= escape_javascript(render :partial => "files/tag_yun_project", :locals => {:tag_list => @tag_list,:project => @project,:tag_name => @select_tag_name}) %>");
     <% else %>
         $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
         $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").replaceWith('<%= escape_javascript(render :partial => 'tags/tag_new', :locals => {:obj => @obj, :object_flag => "6"}) %>');
diff --git a/app/views/tags/update_project_tag_name.js.erb b/app/views/tags/update_project_tag_name.js.erb
index df11b8e57..c1d181e35 100644
--- a/app/views/tags/update_project_tag_name.js.erb
+++ b/app/views/tags/update_project_tag_name.js.erb
@@ -8,4 +8,4 @@ $("#add_tag_<%=@obj.id%>").hide();
 $("#course_list").html("<%= escape_javascript(render :partial => 'files/project_list',
         :locals => {project: @project,all_attachments: @all_attachments,sort:@sort,order:@order,project_attachments:@obj_attachments}) %>");
 <% end %>
-$("#files_tag").html("<%= escape_javascript(render :partial => "files/tag_yun_project", :locals => {:tag_list => @tag_list,:project => @project,:tag_name => @select_tag_name}) %>");
\ No newline at end of file
+$("#files_tag_project").html("<%= escape_javascript(render :partial => "files/tag_yun_project", :locals => {:tag_list => @tag_list,:project => @project,:tag_name => @select_tag_name}) %>");
\ No newline at end of file