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
@@ -107,74 +107,17 @@
   +onSubmit: (event: SyntheticEvent<HTMLElement>) => void,
   +mainContent: ?React.Node,
   +buttons: ?React.Node,
+  +tabs: ?React.Node,
 };
 class ThreadSettingsModal extends React.PureComponent<Props> {
   constructor(props: Props) {
     super(props);
   }
 
-  possiblyChangedValue(key: string) {
-    const valueChanged =
-      this.props.queuedChanges[key] !== null &&
-      this.props.queuedChanges[key] !== undefined;
-    return valueChanged
-      ? this.props.queuedChanges[key]
-      : this.props.threadInfo[key];
-  }
-
   render() {
-    const { threadInfo } = this.props;
-
-    const tabs = [
-      <Tab
-        name="General"
-        tabType="general"
-        onClick={this.props.setCurrentTabType}
-        selected={this.props.currentTabType === 'general'}
-        key="general"
-      />,
-    ];
-
-    // This UI needs to be updated to handle sidebars but we haven't gotten
-    // there yet. We'll probably end up ripping it out anyways, so for now we
-    // are just hiding the privacy tab for any thread that was created as a
-    // sidebar
-    const canSeePrivacyTab =
-      this.possiblyChangedValue('parentThreadID') &&
-      threadInfo.sourceMessageID &&
-      (threadInfo.type === threadTypes.COMMUNITY_OPEN_SUBTHREAD ||
-        threadInfo.type === threadTypes.COMMUNITY_SECRET_SUBTHREAD);
-
-    if (canSeePrivacyTab) {
-      tabs.push(
-        <Tab
-          name="Privacy"
-          tabType="privacy"
-          onClick={this.props.setCurrentTabType}
-          selected={this.props.currentTabType === 'privacy'}
-          key="privacy"
-        />,
-      );
-    }
-    const canDeleteThread = this.props.hasPermissionForTab(
-      threadInfo,
-      'delete',
-    );
-    if (canDeleteThread) {
-      tabs.push(
-        <Tab
-          name="Delete"
-          tabType="delete"
-          onClick={this.props.setCurrentTabType}
-          selected={this.props.currentTabType === 'delete'}
-          key="delete"
-        />,
-      );
-    }
-
     return (
       <Modal name="Thread settings" onClose={this.props.onClose}>
-        <ul className={css.tab_panel}>{tabs}</ul>
+        <ul className={css.tab_panel}>{this.props.tabs}</ul>
         <div className={css.modal_body}>
           <form method="POST">
             {this.props.mainContent}
@@ -470,6 +413,51 @@
       );
     }
 
+    const tabs = [
+      <Tab
+        name="General"
+        tabType="general"
+        onClick={setCurrentTabType}
+        selected={currentTabType === 'general'}
+        key="general"
+      />,
+    ];
+
+    // This UI needs to be updated to handle sidebars but we haven't gotten
+    // there yet. We'll probably end up ripping it out anyways, so for now we
+    // are just hiding the privacy tab for any thread that was created as a
+    // sidebar
+    const canSeePrivacyTab =
+      (queuedChanges['parentThreadID'] ?? threadInfo['parentThreadID']) &&
+      threadInfo.sourceMessageID &&
+      (threadInfo.type === threadTypes.COMMUNITY_OPEN_SUBTHREAD ||
+        threadInfo.type === threadTypes.COMMUNITY_SECRET_SUBTHREAD);
+
+    if (canSeePrivacyTab) {
+      tabs.push(
+        <Tab
+          name="Privacy"
+          tabType="privacy"
+          onClick={setCurrentTabType}
+          selected={currentTabType === 'privacy'}
+          key="privacy"
+        />,
+      );
+    }
+
+    const canDeleteThread = hasPermissionForTab(threadInfo, 'delete');
+    if (canDeleteThread) {
+      tabs.push(
+        <Tab
+          name="Delete"
+          tabType="delete"
+          onClick={setCurrentTabType}
+          selected={currentTabType === 'delete'}
+          key="delete"
+        />,
+      );
+    }
+
     return (
       <ThreadSettingsModal
         {...props}
@@ -503,6 +491,7 @@
         onSubmit={onSubmit}
         mainContent={mainContent}
         buttons={buttons}
+        tabs={tabs}
       />
     );
   },