diff --git a/web/modals/keyserver-selection/keyserver-selection-modal.css b/web/modals/keyserver-selection/keyserver-selection-modal.css
new file mode 100644
index 000000000..6ffb2f52e
--- /dev/null
+++ b/web/modals/keyserver-selection/keyserver-selection-modal.css
@@ -0,0 +1,41 @@
+.container {
+ padding: 0 32px;
+}
+
+.keyserverDetailsContainer {
+ background-color: var(--modal-background-secondary-default);
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ row-gap: 8px;
+ padding: 16px 0;
+ border-radius: 8px;
+ margin-top: 16px;
+}
+
+.keyserverDetailsHeaderContainer {
+ display: flex;
+ align-items: center;
+ column-gap: 8px;
+}
+
+.keyserverURL {
+ color: var(--text-background-primary-default);
+}
+
+.keyserverRemoveTextContainer {
+ color: var(--text-background-primary-default);
+ margin: 16px 0 24px;
+ display: flex;
+ flex-direction: column;
+ row-gap: 24px;
+}
+
+.buttonContainer {
+ background-color: var(--modal-background-secondary-default);
+ padding: 16px 32px;
+}
+
+.button {
+ width: 100%;
+}
diff --git a/web/modals/keyserver-selection/keyserver-selection-modal.react.js b/web/modals/keyserver-selection/keyserver-selection-modal.react.js
new file mode 100644
index 000000000..a627e6774
--- /dev/null
+++ b/web/modals/keyserver-selection/keyserver-selection-modal.react.js
@@ -0,0 +1,62 @@
+// @flow
+
+import * as React from 'react';
+
+import { useModalContext } from 'lib/components/modal-provider.react.js';
+import type { KeyserverInfo } from 'lib/types/keyserver-types.js';
+import type { GlobalAccountUserInfo } from 'lib/types/user-types.js';
+
+import css from './keyserver-selection-modal.css';
+import Button, { buttonThemes } from '../../components/button.react.js';
+import KeyserverPill from '../../components/keyserver-pill.react.js';
+import StatusIndicator from '../../components/status-indicator.react.js';
+import Modal from '../modal.react.js';
+
+type Props = {
+ +keyserverAdminUserInfo: GlobalAccountUserInfo,
+ +keyserverInfo: KeyserverInfo,
+};
+
+function KeyserverSelectionModal(props: Props): React.Node {
+ const { keyserverAdminUserInfo, keyserverInfo } = props;
+
+ const { popModal } = useModalContext();
+
+ return (
+