diff --git a/web/modals/threads/thread-settings-modal.react.js b/web/modals/threads/thread-settings-modal.react.js
--- a/web/modals/threads/thread-settings-modal.react.js
+++ b/web/modals/threads/thread-settings-modal.react.js
@@ -105,6 +105,7 @@
   +onDelete: (event: SyntheticEvent<HTMLElement>) => void,
   +changeThreadSettingsAction: () => Promise<ChangeThreadSettingsPayload>,
   +onSubmit: (event: SyntheticEvent<HTMLElement>) => void,
+  +mainContent: ?React.Node,
 };
 class ThreadSettingsModal extends React.PureComponent<Props> {
   constructor(props: Props) {
@@ -126,39 +127,6 @@
       this.props.changeInProgress ||
       !this.props.hasPermissionForTab(threadInfo, this.props.currentTabType);
 
-    let mainContent = null;
-    if (this.props.currentTabType === 'general') {
-      mainContent = (
-        <ThreadSettingsGeneralTab
-          threadNameValue={firstLine(this.possiblyChangedValue('name'))}
-          threadNamePlaceholder={this.props.namePlaceholder}
-          threadNameOnChange={this.props.onChangeName}
-          threadNameDisabled={inputDisabled}
-          threadDescriptionValue={this.possiblyChangedValue('description')}
-          threadDescriptionOnChange={this.props.onChangeDescription}
-          threadDescriptionDisabled={inputDisabled}
-          threadColorCurrentColor={this.possiblyChangedValue('color')}
-          threadColorOnColorSelection={this.props.onChangeColor}
-        />
-      );
-    } else if (this.props.currentTabType === 'privacy') {
-      mainContent = (
-        <ThreadSettingsPrivacyTab
-          possiblyChangedThreadType={this.possiblyChangedValue('type')}
-          onChangeThreadType={this.props.onChangeThreadType}
-          inputDisabled={inputDisabled}
-        />
-      );
-    } else if (this.props.currentTabType === 'delete') {
-      mainContent = (
-        <ThreadSettingsDeleteTab
-          accountPassword={this.props.accountPassword}
-          onChangeAccountPassword={this.props.onChangeAccountPassword}
-          inputDisabled={inputDisabled}
-        />
-      );
-    }
-
     let buttons = null;
     if (this.props.currentTabType === 'delete') {
       buttons = (
@@ -235,7 +203,7 @@
         <ul className={css.tab_panel}>{tabs}</ul>
         <div className={css.modal_body}>
           <form method="POST">
-            {mainContent}
+            {this.props.mainContent}
             <div className={css.form_footer}>
               {buttons}
               <div className={css.modal_form_error}>
@@ -464,6 +432,50 @@
       );
     }
 
+    const inputDisabled =
+      changeInProgress || !hasPermissionForTab(threadInfo, currentTabType);
+
+    let mainContent;
+    if (currentTabType === 'general') {
+      mainContent = (
+        <ThreadSettingsGeneralTab
+          threadNameValue={firstLine(
+            queuedChanges['name'] ?? threadInfo['name'],
+          )}
+          threadNamePlaceholder={namePlaceholder}
+          threadNameOnChange={onChangeName}
+          threadNameDisabled={inputDisabled}
+          threadDescriptionValue={
+            queuedChanges['description'] ?? threadInfo['description'] ?? ''
+          }
+          threadDescriptionOnChange={onChangeDescription}
+          threadDescriptionDisabled={inputDisabled}
+          threadColorCurrentColor={
+            queuedChanges['color'] ?? threadInfo['color']
+          }
+          threadColorOnColorSelection={onChangeColor}
+        />
+      );
+    } else if (currentTabType === 'privacy') {
+      mainContent = (
+        <ThreadSettingsPrivacyTab
+          possiblyChangedThreadType={
+            queuedChanges['type'] ?? threadInfo['type']
+          }
+          onChangeThreadType={onChangeThreadType}
+          inputDisabled={inputDisabled}
+        />
+      );
+    } else if (currentTabType === 'delete') {
+      mainContent = (
+        <ThreadSettingsDeleteTab
+          accountPassword={accountPassword}
+          onChangeAccountPassword={onChangeAccountPassword}
+          inputDisabled={inputDisabled}
+        />
+      );
+    }
+
     return (
       <ThreadSettingsModal
         {...props}
@@ -495,6 +507,7 @@
         onDelete={onDelete}
         changeThreadSettingsAction={changeThreadSettingsAction}
         onSubmit={onSubmit}
+        mainContent={mainContent}
       />
     );
   },