diff --git a/app/modules/home/working-on/working-on.controller.coffee b/app/modules/home/working-on/working-on.controller.coffee
index 9d101bcf..16f763d1 100644
--- a/app/modules/home/working-on/working-on.controller.coffee
+++ b/app/modules/home/working-on/working-on.controller.coffee
@@ -13,6 +13,8 @@ class WorkingOnController
         issues = workInProgress.get("assignedTo").get("issues")
 
         @.assignedTo = userStories.concat(tasks).concat(issues)
+        if @.assignedTo.size > 0
+            @.assignedTo = @.assignedTo.sortBy((elem) -> elem.get("modified_date")).reverse()
 
     _setWatching: (workInProgress) ->
         userStories = workInProgress.get("watching").get("userStories")
@@ -20,6 +22,8 @@ class WorkingOnController
         issues = workInProgress.get("watching").get("issues")
 
         @.watching = userStories.concat(tasks).concat(issues)
+        if @.watching.size > 0
+            @.watching = @.watching.sortBy((elem) -> elem.get("modified_date")).reverse()
 
     getWorkInProgress: (userId) ->
         return @homeService.getWorkInProgress(userId).then (workInProgress) =>
diff --git a/app/modules/home/working-on/working-on.controller.spec.coffee b/app/modules/home/working-on/working-on.controller.spec.coffee
index 4ba57e5a..e2dcc9ea 100644
--- a/app/modules/home/working-on/working-on.controller.spec.coffee
+++ b/app/modules/home/working-on/working-on.controller.spec.coffee
@@ -32,14 +32,14 @@ describe "WorkingOn", ->
 
         workInProgress = Immutable.fromJS({
             assignedTo: {
-                userStories: [{id: 1}, {id: 2}],
-                tasks: [{id: 3}, {id: 4}],
-                issues: [{id: 5}, {id: 6}]
+                userStories: [{id: 1, modified_date: "2015-01-01"}, {id: 2, modified_date: "2015-01-04"}],
+                tasks: [{id: 3, modified_date: "2015-01-02"}, {id: 4, modified_date: "2015-01-05"}],
+                issues: [{id: 5, modified_date: "2015-01-03"}, {id: 6, modified_date: "2015-01-06"}]
             },
             watching: {
-                userStories: [{id: 7}, {id: 8}],
-                tasks: [{id: 9}, {id: 10}],
-                issues: [{id: 11}, {id: 12}]
+                userStories: [{id: 7, modified_date: "2015-01-01"}, {id: 8, modified_date: "2015-01-04"}],
+                tasks: [{id: 9, modified_date: "2015-01-02"}, {id: 10, modified_date: "2015-01-05"}],
+                issues: [{id: 11, modified_date: "2015-01-03"}, {id: 12, modified_date: "2015-01-06"}]
             }
         })
 
@@ -48,12 +48,23 @@ describe "WorkingOn", ->
         ctrl = $controller("WorkingOn")
 
         ctrl.getWorkInProgress(userId).then () ->
+            console.log ctrl.assignedTo.toJS()
             expect(ctrl.assignedTo.toJS()).to.be.eql([
-                {id: 1}, {id: 2}, {id: 3}, {id: 4}, {id: 5}, {id: 6}
+                {id: 6, modified_date: '2015-01-06'},
+                {id: 4, modified_date: '2015-01-05'},
+                {id: 2, modified_date: '2015-01-04'},
+                {id: 5, modified_date: '2015-01-03'},
+                {id: 3, modified_date: '2015-01-02'},
+                {id: 1, modified_date: '2015-01-01'}
             ])
 
             expect(ctrl.watching.toJS()).to.be.eql([
-                {id: 7}, {id: 8}, {id: 9}, {id: 10}, {id: 11}, {id: 12}
+                {id: 12, modified_date: '2015-01-06'},
+                {id: 10, modified_date: '2015-01-05'},
+                {id: 8, modified_date: '2015-01-04'},
+                {id: 11, modified_date: '2015-01-03'},
+                {id: 9, modified_date: '2015-01-02'},
+                {id: 7, modified_date: '2015-01-01'}
             ])
 
             done()