diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditCardItems.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditCardItems.kt
index 275d8c4b7..6de983667 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditCardItems.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditCardItems.kt
@@ -166,7 +166,9 @@ fun LazyListScope.vaultAddEditCardItems(
                         .first { it.name == selectedFolderName },
                 )
             },
-            modifier = Modifier.padding(horizontal = 16.dp),
+            modifier = Modifier
+                .semantics { testTag = "FolderPicker" }
+                .padding(horizontal = 16.dp),
         )
     }
 
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditIdentityItems.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditIdentityItems.kt
index 69e58afec..1177aad5c 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditIdentityItems.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditIdentityItems.kt
@@ -275,7 +275,9 @@ fun LazyListScope.vaultAddEditIdentityItems(
                         .first { it.name == selectedFolderName },
                 )
             },
-            modifier = Modifier.padding(horizontal = 16.dp),
+            modifier = Modifier
+                .semantics { testTag = "FolderPicker" }
+                .padding(horizontal = 16.dp),
         )
     }
 
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditLoginItems.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditLoginItems.kt
index 536991f58..15becc34e 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditLoginItems.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditLoginItems.kt
@@ -202,7 +202,9 @@ fun LazyListScope.vaultAddEditLoginItems(
                         .first { it.name == selectedFolderName },
                 )
             },
-            modifier = Modifier.padding(horizontal = 16.dp),
+            modifier = Modifier
+                .semantics { testTag = "FolderPicker" }
+                .padding(horizontal = 16.dp),
         )
     }
 
@@ -375,11 +377,10 @@ private fun UsernameRow(
                         shouldShowDialog = true
                     }
                 },
+                modifier = Modifier.semantics { testTag = "GenerateUsernameButton" },
             )
         },
-        modifier = Modifier
-            .semantics { testTag = "GenerateUsernameButton" }
-            .padding(horizontal = 16.dp),
+        modifier = Modifier.padding(horizontal = 16.dp),
     )
 
     if (shouldShowDialog) {
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditSecureNotesItems.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditSecureNotesItems.kt
index 3a682d8a9..22204fa31 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditSecureNotesItems.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditSecureNotesItems.kt
@@ -74,7 +74,9 @@ fun LazyListScope.vaultAddEditSecureNotesItems(
                         .first { it.name == selectedFolderName },
                 )
             },
-            modifier = Modifier.padding(horizontal = 16.dp),
+            modifier = Modifier
+                .semantics { testTag = "FolderPicker" }
+                .padding(horizontal = 16.dp),
         )
     }