diff --git a/RiotSwiftUI/Modules/Room/Composer/View/Composer.swift b/RiotSwiftUI/Modules/Room/Composer/View/Composer.swift
index 93793fb72..824e04d73 100644
--- a/RiotSwiftUI/Modules/Room/Composer/View/Composer.swift
+++ b/RiotSwiftUI/Modules/Room/Composer/View/Composer.swift
@@ -256,7 +256,7 @@ struct Composer: View {
                     }
                 }
                 if wysiwygViewModel.maximised {
-                    UserSuggestionList(viewModel: userSuggestionSharedContext.context)
+                    UserSuggestionList(viewModel: userSuggestionSharedContext.context, showBackgroundShadow: false)
                         .environmentObject(AvatarViewModel(avatarService: AvatarService(mediaManager: userSuggestionSharedContext.mediaManager)))
                 }
             }
diff --git a/RiotSwiftUI/Modules/Room/UserSuggestion/View/UserSuggestionList.swift b/RiotSwiftUI/Modules/Room/UserSuggestion/View/UserSuggestionList.swift
index 859b0b414..9c32b892f 100644
--- a/RiotSwiftUI/Modules/Room/UserSuggestion/View/UserSuggestionList.swift
+++ b/RiotSwiftUI/Modules/Room/UserSuggestion/View/UserSuggestionList.swift
@@ -35,6 +35,7 @@ struct UserSuggestionList: View {
     // MARK: Public
     
     @ObservedObject var viewModel: UserSuggestionViewModel.Context
+    var showBackgroundShadow: Bool = true
     
     var body: some View {
         if viewModel.viewState.items.isEmpty {
@@ -46,25 +47,12 @@ struct UserSuggestionList: View {
                                        userId: "Prototype")
                     .background(ViewFrameReader(frame: $prototypeListItemFrame))
                     .hidden()
-                BackgroundView {
-                    List(viewModel.viewState.items) { item in
-                        Button {
-                            viewModel.send(viewAction: .selectedItem(item))
-                        } label: {
-                            UserSuggestionListItem(
-                                avatar: item.avatar,
-                                displayName: item.displayName,
-                                userId: item.id
-                            )
-                            .padding(.bottom, Constants.listItemPadding)
-                            .padding(.top, viewModel.viewState.items.first?.id == item.id ? Constants.listItemPadding + Constants.topPadding : Constants.listItemPadding)
-                        }
+                if showBackgroundShadow {
+                    BackgroundView {
+                        list()
                     }
-                    .listStyle(PlainListStyle())
-                    .frame(height: min(Constants.maxHeight,
-                                       min(contentHeightForRowCount(Constants.maxVisibleRows),
-                                           contentHeightForRowCount(viewModel.viewState.items.count))))
-                    .id(UUID()) // Rebuild the whole list on item changes. Fixes performance issues.
+                } else {
+                    list()
                 }
             }
         }
@@ -73,6 +61,27 @@ struct UserSuggestionList: View {
     private func contentHeightForRowCount(_ count: Int) -> CGFloat {
         (prototypeListItemFrame.height + (Constants.listItemPadding * 2) + Constants.lineSpacing) * CGFloat(count) + Constants.topPadding
     }
+
+    private func list() -> some View {
+        List(viewModel.viewState.items) { item in
+            Button {
+                viewModel.send(viewAction: .selectedItem(item))
+            } label: {
+                UserSuggestionListItem(
+                    avatar: item.avatar,
+                    displayName: item.displayName,
+                    userId: item.id
+                )
+                .padding(.bottom, Constants.listItemPadding)
+                .padding(.top, viewModel.viewState.items.first?.id == item.id ? Constants.listItemPadding + Constants.topPadding : Constants.listItemPadding)
+            }
+        }
+        .listStyle(PlainListStyle())
+        .frame(height: min(Constants.maxHeight,
+                           min(contentHeightForRowCount(Constants.maxVisibleRows),
+                               contentHeightForRowCount(viewModel.viewState.items.count))))
+        .id(UUID()) // Rebuild the whole list on item changes. Fixes performance issues.
+    }
 }
 
 private struct BackgroundView<Content: View>: View {