diff --git a/platform/collaboration-tools/resources/intellij.platform.collaborationTools.xml b/platform/collaboration-tools/resources/intellij.platform.collaborationTools.xml
index d9e8533ca1fa..dac7b4940e9c 100644
--- a/platform/collaboration-tools/resources/intellij.platform.collaborationTools.xml
+++ b/platform/collaboration-tools/resources/intellij.platform.collaborationTools.xml
@@ -21,6 +21,10 @@
                      default="false"
                      bundle="messages.CollaborationToolsBundle"
                      groupKey="advanced.settings.collab.tools"/>
+    <advancedSetting id="show.review.threads.with.increased.margins"
+                     default="true"
+                     bundle="messages.CollaborationToolsBundle"
+                     groupKey="advanced.settings.collab.tools"/>
   </extensions>
   <applicationListeners>
     <listener class="com.intellij.collaboration.ui.codereview.CodeReviewCombinedDiffAdvancedSettingsChangeListener"
diff --git a/plugins/github/github-core/resources/intellij.vcs.github.xml b/plugins/github/github-core/resources/intellij.vcs.github.xml
index c69ddb1822c4..5ee46587f851 100644
--- a/plugins/github/github-core/resources/intellij.vcs.github.xml
+++ b/plugins/github/github-core/resources/intellij.vcs.github.xml
@@ -98,12 +98,6 @@
     <registryKey defaultValue="true"
                  description="Disable new ways of adding multiline comments in unified diff"
                  key="github.pr.new.multiline.comments.disabled"/>"/>
-    <advancedSetting
-      id="show.review.threads.with.increased.margins"
-      default="true"
-      bundle="messages.CollaborationToolsBundle"
-      groupKey="advanced.settings.collab.tools"
-    />
 
     <vcs.github.gistContentsCollector
       implementation="org.jetbrains.plugins.github.DefaultGithubGistContentsCollector"