diff --git a/Changelog.md b/Changelog.md
index 570726956..8e346b775 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,7 @@
 ## Refactor
 * Remove title from profile photo upload button [#7551](https://github.com/diaspora/diaspora/pull/7551)
 * Remove Internet Explorer workarounds [#7557](https://github.com/diaspora/diaspora/pull/7557)
+* Sort notifications by last interaction [#7568](https://github.com/diaspora/diaspora/pull/7568)
 
 ## Bug fixes
 * Fix displaying polls with long answers [#7579](https://github.com/diaspora/diaspora/pull/7579)
diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index 0d1714ea0..c1f714778 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -32,7 +32,7 @@ class NotificationsController < ApplicationController
     @notifications = WillPaginate::Collection.create(page, per_page, Notification.where(conditions).count ) do |pager|
       result = Notification.where(conditions)
                            .includes(:target, :actors => :profile)
-                           .order('created_at desc')
+                           .order("updated_at desc")
                            .limit(pager.per_page)
                            .offset(pager.offset)