diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 43d5d1acf6..569569f85c 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -125,6 +125,10 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
       if (statusType(status) === 'retweet' && status.retweeted_status.user.id === user.id) {
         addNotification({ type: 'repeat', status: status.retweeted_status, action: status })
       }
+
+      if (statusType(status) === 'status' && find(status.attentions, { id: user.id })) {
+        addNotification({ type: 'mention', status, action: status })
+      }
     }
 
     // Some statuses should only be added to the global status repository.
diff --git a/test/unit/specs/modules/statuses.spec.js b/test/unit/specs/modules/statuses.spec.js
index bdb6293e5d..6407fc93e7 100644
--- a/test/unit/specs/modules/statuses.spec.js
+++ b/test/unit/specs/modules/statuses.spec.js
@@ -9,7 +9,8 @@ const makeMockStatus = ({id, text, is_post_verb = true}) => {
     text: text || `Text number ${id}`,
     fave_num: 0,
     uri: '',
-    is_post_verb
+    is_post_verb,
+    attentions: []
   }
 }
 
@@ -181,6 +182,24 @@ describe('The Statuses module', () => {
     expect(state.notifications[0].type).to.eql('repeat')
   })
 
+  it('adds a notification when you are mentioned', () => {
+    const user = { id: 1 }
+    const state = cloneDeep(defaultState)
+    const status = makeMockStatus({id: 1})
+    const mentionedStatus = makeMockStatus({id: 2})
+    mentionedStatus.attentions = [user]
+
+    mutations.addNewStatuses(state, { statuses: [status], user })
+
+    expect(state.notifications.length).to.eql(0)
+
+    mutations.addNewStatuses(state, { statuses: [mentionedStatus], user })
+    expect(state.notifications.length).to.eql(1)
+    expect(state.notifications[0].status).to.eql(mentionedStatus)
+    expect(state.notifications[0].action).to.eql(mentionedStatus)
+    expect(state.notifications[0].type).to.eql('mention')
+  })
+
   it('replaces existing statuses with the same id', () => {
     const state = cloneDeep(defaultState)
     const status = makeMockStatus({id: 1})