diff --git a/.maestro/tests/account/logout.yaml b/.maestro/tests/account/logout.yaml
index c2f75e0977..38f22b34f5 100644
--- a/.maestro/tests/account/logout.yaml
+++ b/.maestro/tests/account/logout.yaml
@@ -6,7 +6,8 @@ appId: ${APP_ID}
 - takeScreenshot: build/maestro/900-SignOutScreen
 - back
 - tapOn: "Sign out"
-- tapOn: "Sign out"
+- tapOn:
+    id: "sign-out-submit"
 # Ensure cancel cancels
 - tapOn: "Cancel"
 - tapOn: "Sign out"
diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt
index 465eb7eb35..486e3964fa 100644
--- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt
+++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt
@@ -46,6 +46,8 @@ import io.element.android.libraries.designsystem.theme.progressIndicatorTrackCol
 import io.element.android.libraries.designsystem.utils.CommonDrawables
 import io.element.android.libraries.matrix.api.encryption.BackupUploadState
 import io.element.android.libraries.matrix.api.encryption.SteadyStateException
+import io.element.android.libraries.testtags.TestTags
+import io.element.android.libraries.testtags.testTag
 import io.element.android.libraries.theme.ElementTheme
 import io.element.android.libraries.ui.strings.CommonStrings
 
@@ -194,7 +196,9 @@ private fun BottomMenu(
             text = stringResource(id = signOutSubmitRes),
             showProgress = logoutAction is Async.Loading,
             destructive = true,
-            modifier = Modifier.fillMaxWidth(),
+            modifier = Modifier
+                .fillMaxWidth()
+                .testTag(TestTags.signOut),
             onClick = onLogoutClicked,
         )
     }
diff --git a/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/TestTags.kt b/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/TestTags.kt
index d90be0c25c..f28ed77001 100644
--- a/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/TestTags.kt
+++ b/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/TestTags.kt
@@ -33,6 +33,11 @@ object TestTags {
     val loginPassword = TestTag("login-password")
     val loginContinue = TestTag("login-continue")
 
+    /**
+     * Sign out screen.
+     */
+    val signOut = TestTag("sign-out-submit")
+
     /**
      * Change server screen.
      */