diff --git a/Riot/Modules/Settings/Security/SecurityViewController.m b/Riot/Modules/Settings/Security/SecurityViewController.m
index cb72f38df1..e241de75e8 100644
--- a/Riot/Modules/Settings/Security/SecurityViewController.m
+++ b/Riot/Modules/Settings/Security/SecurityViewController.m
@@ -759,6 +759,7 @@ - (void)setupCrossSigning:(id)sender
     [self setupCrossSigningWithTitle:@"Set up cross-signing"    // TODO
                              message:[VectorL10n securitySettingsUserPasswordDescription]
                              success:^{
+                                [self loadCrossSigning];
                              } failure:^(NSError *error) {
                              }];
 }
@@ -985,6 +986,7 @@ - (void)setupSecureBackup
         [self setupCrossSigningWithTitle:[VectorL10n secureKeyBackupSetupIntroTitle]
                                  message:[VectorL10n securitySettingsUserPasswordDescription]
                                  success:^{
+                                     [self loadCrossSigning];
                                      [self setupSecureBackup2];
                                  } failure:^(NSError *error) {
                                  }];
diff --git a/changelog.d/update-cross-signing-status-ui-after-activation.change b/changelog.d/update-cross-signing-status-ui-after-activation.change
new file mode 100644
index 0000000000..a589082db9
--- /dev/null
+++ b/changelog.d/update-cross-signing-status-ui-after-activation.change
@@ -0,0 +1 @@
+Update cross-signing status ui after activation in settings
\ No newline at end of file