diff --git a/src/widget/friendlistwidget.cpp b/src/widget/friendlistwidget.cpp
index a7693e2df..eecf6f1ea 100644
--- a/src/widget/friendlistwidget.cpp
+++ b/src/widget/friendlistwidget.cpp
@@ -53,7 +53,7 @@ bool last7DaysWasLastMonth()
     return QDate::currentDate().addDays(-7).month() == QDate::currentDate().month();
 }
 
-Time getTime(const QDate date)
+Time getTime(const QDate& date)
 {
     if (date == QDate())
         return Never;
@@ -231,12 +231,15 @@ void FriendListWidget::setMode(Mode mode)
         activityLayout->addWidget(categoryLastWeek);
 
         QDate currentDate = QDate::currentDate();
-        if (last7DaysWasLastMonth())
+        //if (last7DaysWasLastMonth())
         {
             CategoryWidget* categoryThisMonth = new CategoryWidget(this);
             categoryThisMonth->setName(tr("This month", "Category for sorting friends by activity"));
             activityLayout->addWidget(categoryThisMonth);
-            currentDate = currentDate.addMonths(-1);
+            categoryThisMonth->setVisible(last7DaysWasLastMonth());
+
+            if (categoryThisMonth->isVisible())
+                currentDate = currentDate.addMonths(-1);
         }
 
         CategoryWidget* categoryLast1Month = new CategoryWidget(this);
@@ -276,8 +279,6 @@ void FriendListWidget::setMode(Mode mode)
         {
             QDate activityDate = getDateFriend(contact);
             Time time = getTime(activityDate);
-            if (!last7DaysWasLastMonth())
-                time = static_cast<Time>(time-1);
             CategoryWidget* categoryWidget = dynamic_cast<CategoryWidget*>(activityLayout->itemAt(time)->widget());
             categoryWidget->addFriendWidget(contact->getFriendWidget(), contact->getStatus());
         }
@@ -649,6 +650,17 @@ void FriendListWidget::moveWidget(FriendWidget* w, Status s, bool add)
     }
 }
 
+void FriendListWidget::updateActivityDate(const QDate& date)
+{
+    if (mode != Activity)
+        return;
+
+    CategoryWidget* categoryWidget = static_cast<CategoryWidget*>(activityLayout->itemAt(getTime(date))->widget());
+    categoryWidget->updateStatus();
+
+    categoryWidget->setVisible(categoryWidget->hasChatrooms());
+}
+
 // update widget after add/delete/hide/show
 void FriendListWidget::reDraw()
 {
diff --git a/src/widget/friendlistwidget.h b/src/widget/friendlistwidget.h
index f890fa912..220c8e2b0 100644
--- a/src/widget/friendlistwidget.h
+++ b/src/widget/friendlistwidget.h
@@ -60,6 +60,7 @@ public:
     void cycleContacts(GenericChatroomWidget* activeChatroomWidget, bool forward);
     QVector<CircleWidget*> getAllCircles();
 
+    void updateActivityDate(const QDate& date);
     void reDraw();
 
 signals:
diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp
index fa9b15e61..eb097bb95 100644
--- a/src/widget/widget.cpp
+++ b/src/widget/widget.cpp
@@ -907,8 +907,11 @@ void Widget::updateFriendActivity(Friend *frnd)
     QDate date = Settings::getInstance().getFriendActivity(frnd->getToxId());
     if (date != QDate::currentDate())
     {
+        // Update old activity before after new one. Store old date first.
+        QDate oldDate = Settings::getInstance().getFriendActivity(frnd->getToxId());
         Settings::getInstance().setFriendActivity(frnd->getToxId(), QDate::currentDate());
         contactListWidget->moveWidget(frnd->getFriendWidget(), frnd->getStatus());
+        contactListWidget->updateActivityDate(oldDate);
     }
 }