diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/BunkerMultiEventHomeScreen.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/BunkerMultiEventHomeScreen.kt
index 03c0e2be..fbcb3051 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/BunkerMultiEventHomeScreen.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/BunkerMultiEventHomeScreen.kt
@@ -190,6 +190,19 @@ fun BunkerMultiEventHomeScreen(
                         )
                     }
                 }
+                if (groupKey.hasGroupOptions()) {
+                    item(key = "group-options:${groupKey.type.name}:${groupKey.payload?.name ?: ""}:${groupKey.kind ?: ""}") {
+                        RequestGroupOptions(
+                            groupKey = groupKey,
+                            rememberType = groupRememberTypes[groupKey] ?: RememberType.NEVER,
+                            onRememberTypeChanged = { groupRememberTypes[groupKey] = it },
+                            relayAuthScope = groupRelayAuthScopes[groupKey] ?: RelayAuthScope.SPECIFIC,
+                            onRelayAuthScopeChanged = { groupRelayAuthScopes[groupKey] = it },
+                            decryptTypeScope = groupDecryptScopes[groupKey] ?: defaultDecryptTypeScope(groupKey.type),
+                            onDecryptTypeScopeChanged = { groupDecryptScopes[groupKey] = it },
+                        )
+                    }
+                }
                 if (expanded) {
                     items(groupItems, key = { it.request.id }) { bunkerRequest ->
                         BunkerRequestCard(
@@ -202,19 +215,6 @@ fun BunkerMultiEventHomeScreen(
                             },
                         )
                     }
-                    if (groupKey.hasGroupOptions()) {
-                        item(key = "group-options:${groupKey.type.name}:${groupKey.payload?.name ?: ""}:${groupKey.kind ?: ""}") {
-                            RequestGroupOptions(
-                                groupKey = groupKey,
-                                rememberType = groupRememberTypes[groupKey] ?: RememberType.NEVER,
-                                onRememberTypeChanged = { groupRememberTypes[groupKey] = it },
-                                relayAuthScope = groupRelayAuthScopes[groupKey] ?: RelayAuthScope.SPECIFIC,
-                                onRelayAuthScopeChanged = { groupRelayAuthScopes[groupKey] = it },
-                                decryptTypeScope = groupDecryptScopes[groupKey] ?: defaultDecryptTypeScope(groupKey.type),
-                                onDecryptTypeScopeChanged = { groupDecryptScopes[groupKey] = it },
-                            )
-                        }
-                    }
                 }
             }
         }
diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/IntentMultiEventHomeScreen.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/IntentMultiEventHomeScreen.kt
index c1966970..bb914703 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/IntentMultiEventHomeScreen.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/IntentMultiEventHomeScreen.kt
@@ -156,6 +156,19 @@ fun IntentMultiEventHomeScreen(
                         )
                     }
                 }
+                if (groupKey.hasGroupOptions()) {
+                    item(key = "group-options:${groupKey.type.name}:${groupKey.payload?.name ?: ""}:${groupKey.kind ?: ""}") {
+                        RequestGroupOptions(
+                            groupKey = groupKey,
+                            rememberType = groupRememberTypes[groupKey] ?: RememberType.NEVER,
+                            onRememberTypeChanged = { groupRememberTypes[groupKey] = it },
+                            relayAuthScope = groupRelayAuthScopes[groupKey] ?: RelayAuthScope.SPECIFIC,
+                            onRelayAuthScopeChanged = { groupRelayAuthScopes[groupKey] = it },
+                            decryptTypeScope = groupDecryptScopes[groupKey] ?: defaultDecryptTypeScope(groupKey.type),
+                            onDecryptTypeScopeChanged = { groupDecryptScopes[groupKey] = it },
+                        )
+                    }
+                }
                 if (expanded) {
                     items(groupIntents, key = { it.id }) { intent ->
                         IntentRequestCard(
@@ -168,19 +181,6 @@ fun IntentMultiEventHomeScreen(
                             },
                         )
                     }
-                    if (groupKey.hasGroupOptions()) {
-                        item(key = "group-options:${groupKey.type.name}:${groupKey.payload?.name ?: ""}:${groupKey.kind ?: ""}") {
-                            RequestGroupOptions(
-                                groupKey = groupKey,
-                                rememberType = groupRememberTypes[groupKey] ?: RememberType.NEVER,
-                                onRememberTypeChanged = { groupRememberTypes[groupKey] = it },
-                                relayAuthScope = groupRelayAuthScopes[groupKey] ?: RelayAuthScope.SPECIFIC,
-                                onRelayAuthScopeChanged = { groupRelayAuthScopes[groupKey] = it },
-                                decryptTypeScope = groupDecryptScopes[groupKey] ?: defaultDecryptTypeScope(groupKey.type),
-                                onDecryptTypeScopeChanged = { groupDecryptScopes[groupKey] = it },
-                            )
-                        }
-                    }
                 }
             }
         }