diff --git a/res/css/views/dialogs/_BetaFeedbackDialog.scss b/res/css/views/dialogs/_BetaFeedbackDialog.scss
index fe3df01986..9f5f6b512e 100644
--- a/res/css/views/dialogs/_BetaFeedbackDialog.scss
+++ b/res/css/views/dialogs/_BetaFeedbackDialog.scss
@@ -16,7 +16,7 @@ limitations under the License.
 
 .mx_BetaFeedbackDialog {
     .mx_BetaFeedbackDialog_subheading {
-        color: $secondary-fg-color;
+        color: $primary-fg-color;
         font-size: $font-14px;
         line-height: $font-20px;
         margin-bottom: 24px;
diff --git a/src/components/views/dialogs/BetaFeedbackDialog.tsx b/src/components/views/dialogs/BetaFeedbackDialog.tsx
index 6619f11b33..1ae50dd66f 100644
--- a/src/components/views/dialogs/BetaFeedbackDialog.tsx
+++ b/src/components/views/dialogs/BetaFeedbackDialog.tsx
@@ -59,7 +59,7 @@ const BetaFeedbackDialog: React.FC<IProps> = ({featureId, onFinished}) => {
     return (<QuestionDialog
         className="mx_BetaFeedbackDialog"
         hasCancelButton={true}
-        title={_t("Beta feedback")}
+        title={_t("%(featureName)s beta feedback", { featureName: info.title })}
         description={<React.Fragment>
             <div className="mx_BetaFeedbackDialog_subheading">
                 { _t(info.feedbackSubheading) }
@@ -87,6 +87,7 @@ const BetaFeedbackDialog: React.FC<IProps> = ({featureId, onFinished}) => {
                 onChange={(ev) => {
                     setComment(ev.target.value);
                 }}
+                autoFocus={true}
             />
 
             <StyledCheckbox
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index da58680424..dbe712c691 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -792,7 +792,7 @@
     "%(brand)s will reload with Spaces enabled. Communities and custom tags will be hidden.": "%(brand)s will reload with Spaces enabled. Communities and custom tags will be hidden.",
     "You can leave the beta any time from settings or tapping on a beta badge, like the one above.": "You can leave the beta any time from settings or tapping on a beta badge, like the one above.",
     "Beta available for web, desktop and Android. Some features may be unavailable on your homeserver.": "Beta available for web, desktop and Android. Some features may be unavailable on your homeserver.",
-    "You’re using an early version of Spaces, your feedback will really help inform the next versions.": "You’re using an early version of Spaces, your feedback will really help inform the next versions.",
+    "Your feedback will help make spaces better. The more detail you can go into, the better.": "Your feedback will help make spaces better. The more detail you can go into, the better.",
     "Show options to enable 'Do not disturb' mode": "Show options to enable 'Do not disturb' mode",
     "Send and receive voice messages": "Send and receive voice messages",
     "Render LaTeX maths in messages": "Render LaTeX maths in messages",
@@ -2066,6 +2066,7 @@
     "Close dialog": "Close dialog",
     "Beta feedback": "Beta feedback",
     "Thank you for your feedback, we really appreciate it.": "Thank you for your feedback, we really appreciate it.",
+    "%(featureName)s beta feedback": "%(featureName)s beta feedback",
     "Your platform and username will be noted to help us use your feedback as much as we can.": "Your platform and username will be noted to help us use your feedback as much as we can.",
     "To leave the beta, visit your settings.": "To leave the beta, visit your settings.",
     "Feedback": "Feedback",
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index 9e27550499..577f23fa3a 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -164,8 +164,8 @@ export const SETTINGS: {[setting: string]: ISetting} = {
                 </>;
             },
             image: require("../../res/img/betas/spaces.png"),
-            feedbackSubheading: _td("You’re using an early version of Spaces, " +
-                "your feedback will really help inform the next versions."),
+            feedbackSubheading: _td("Your feedback will help make spaces better. " +
+                "The more detail you can go into, the better."),
             feedbackLabel: "spaces-feedback",
         },
     },