diff --git a/src/mainview/MainView.qml b/src/mainview/MainView.qml
index 960c22a6..73c71374 100644
--- a/src/mainview/MainView.qml
+++ b/src/mainview/MainView.qml
@@ -463,6 +463,11 @@ Rectangle {
             function onNavigateToWelcomePageRequested() {
                 backToMainView()
             }
+
+            function onInvitationAccepted() {
+                mainViewSidePanel.selectTab(SidePanelTabBar.Conversations)
+                showWelcomeView()
+            }
         }
 
         Component.onCompleted: {
diff --git a/src/messagesadapter.cpp b/src/messagesadapter.cpp
index 971bfd5f..644d86dc 100644
--- a/src/messagesadapter.cpp
+++ b/src/messagesadapter.cpp
@@ -664,6 +664,9 @@ MessagesAdapter::acceptInvitation(const QString& convUid)
 {
     const auto currentConvUid = convUid.isEmpty() ? lrcInstance_->getCurrentConvUid() : convUid;
     lrcInstance_->getCurrentConversationModel()->makePermanent(currentConvUid);
+    if (convUid == currentConvUid_)
+        currentConvUid_.clear();
+    emit invitationAccepted();
 }
 
 void
diff --git a/src/messagesadapter.h b/src/messagesadapter.h
index f94e58aa..1d5773a5 100644
--- a/src/messagesadapter.h
+++ b/src/messagesadapter.h
@@ -91,6 +91,7 @@ signals:
     void needToUpdateSmartList();
     void contactBanned();
     void navigateToWelcomePageRequested();
+    void invitationAccepted();
 
 public slots:
     void slotSendMessageContentSaved(const QString& content);