diff --git a/app/coffee/modules/userstories/detail.coffee b/app/coffee/modules/userstories/detail.coffee
index 535b8573..d69f8779 100644
--- a/app/coffee/modules/userstories/detail.coffee
+++ b/app/coffee/modules/userstories/detail.coffee
@@ -31,7 +31,7 @@ module = angular.module("taigaUserStories")
 ## User story Detail Controller
 #############################################################################
 
-class UserStoryDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
+class UserStoryDetailController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.AttachmentsMixin)
     @.$inject = [
         "$scope",
         "$rootScope",
@@ -40,10 +40,13 @@ class UserStoryDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
         "$tgResources",
         "$routeParams",
         "$q",
-        "$location"
+        "$location",
+        "$log"
     ]
 
-    constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location) ->
+    constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @log) ->
+        @.attachmentsUrlName = "userstories/attachments"
+
         @scope.issueRef = @params.issueref
         @scope.sectionName = "User Story Details"
 
@@ -107,6 +110,7 @@ class UserStoryDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
                       .then(=> @.loadUsersAndRoles())
                       .then(=> @.loadUs())
                       .then(=> @.loadTasks())
+                      .then(=> @.loadAttachments(@scope.usId))
                       .then(=> @.loadHistory())
 
     getUserFullName: (userId) ->
diff --git a/app/partials/us-detail-edit.jade b/app/partials/us-detail-edit.jade
index c51fc7f3..b3488d85 100644
--- a/app/partials/us-detail-edit.jade
+++ b/app/partials/us-detail-edit.jade
@@ -26,7 +26,8 @@ block content
             section.us-content
                 textarea(placeholder="Write a description of your user story", ng-model="us.description", tg-markitup)
 
-            // include views/modules/attachments
+            include views/modules/attachments
+
             textarea(ng-model="us.comment", placeholder="Write here a new commet")
 
         sidebar.menu-secondary.sidebar
diff --git a/app/partials/us-detail.jade b/app/partials/us-detail.jade
index 25578f6d..4fe985fc 100644
--- a/app/partials/us-detail.jade
+++ b/app/partials/us-detail.jade
@@ -29,7 +29,8 @@ block content
 
             section.us-content.wysiwyg(tg-bind-html="us.description_html")
 
-            //include views/modules/attachments
+            include views/modules/attachments
+
             section.us-activity
                 ul.us-activity-tabs
                     li