diff --git a/RiotSwiftUI/Modules/Spaces/AddRoomSelector/View/AddRoomSelector.swift b/RiotSwiftUI/Modules/Spaces/AddRoomSelector/View/AddRoomSelector.swift
index b56a0642d..f4468e6c3 100644
--- a/RiotSwiftUI/Modules/Spaces/AddRoomSelector/View/AddRoomSelector.swift
+++ b/RiotSwiftUI/Modules/Spaces/AddRoomSelector/View/AddRoomSelector.swift
@@ -26,6 +26,9 @@ struct AddRoomSelector: View {
     // MARK: Private
     
     @Environment(\.theme) private var theme: ThemeSwiftUI
+    private var isDoneEnabled: Bool {
+        return !viewModel.viewState.selectedItemIds.isEmpty && !viewModel.viewState.loading
+    }
 
     // MARK: Setup
     
@@ -50,7 +53,7 @@ struct AddRoomSelector: View {
             viewModel.send(viewAction: .done)
         })
         .font(theme.fonts.body)
-        .opacity(viewModel.viewState.selectedItemIds.isEmpty ? 0.7 : 1)
-        .disabled(viewModel.viewState.selectedItemIds.isEmpty)
+        .opacity(isDoneEnabled ? 1 : 0.7)
+        .disabled(!isDoneEnabled)
     }
 }
diff --git a/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooser.swift b/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooser.swift
index 9c6b53f07..16c0aac98 100644
--- a/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooser.swift
+++ b/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooser.swift
@@ -44,7 +44,7 @@ struct MatrixItemChooser: View {
     var body: some View {
         listContent
             .background(Color.clear)
-            .waitOverlay(show: viewModel.viewState.loading)
+            .waitOverlay(show: viewModel.viewState.loading, message: viewModel.viewState.loadingText, allowUserInteraction: false)
             .alert(isPresented: .constant(viewModel.viewState.error != nil)) {
                 Alert(title: Text(VectorL10n.error), message: Text(viewModel.viewState.error ?? ""), dismissButton: .cancel(Text(VectorL10n.ok)))
             }
diff --git a/changelog.d/5901.bugfix b/changelog.d/5901.bugfix
new file mode 100644
index 000000000..9d84ae4a3
--- /dev/null
+++ b/changelog.d/5901.bugfix
@@ -0,0 +1 @@
+Add button in create room dialog can be pressed multiple times
\ No newline at end of file