diff --git a/plugins/git4idea/frontend/src/com/intellij/vcs/git/frontend/widget/GitToolbarWidgetAction.kt b/plugins/git4idea/frontend/src/com/intellij/vcs/git/frontend/widget/GitToolbarWidgetAction.kt
index 50fc272fd280..8da94b2da380 100644
--- a/plugins/git4idea/frontend/src/com/intellij/vcs/git/frontend/widget/GitToolbarWidgetAction.kt
+++ b/plugins/git4idea/frontend/src/com/intellij/vcs/git/frontend/widget/GitToolbarWidgetAction.kt
@@ -2,12 +2,13 @@
 package com.intellij.vcs.git.frontend.widget
 
 import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.actionSystem.remoting.ActionRemoteBehaviorSpecification
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.registry.Registry
 import com.intellij.vcs.git.shared.isRdBranchWidgetEnabled
 import com.intellij.vcs.git.shared.widget.GitToolbarWidgetActionBase
 
-class GitToolbarWidgetAction: GitToolbarWidgetActionBase() {
+internal class GitToolbarWidgetAction: GitToolbarWidgetActionBase(), ActionRemoteBehaviorSpecification.Frontend {
   override fun doUpdate(e: AnActionEvent, project: Project) {
     if (!Registry.isRdBranchWidgetEnabled()) {
       e.presentation.isEnabledAndVisible = false
diff --git a/plugins/git4idea/shared/src/com/intellij/vcs/git/shared/GitDataHoldersInitializer.kt b/plugins/git4idea/shared/src/com/intellij/vcs/git/shared/GitDataHoldersInitializer.kt
index 4f36412c8787..f7da6c670c44 100644
--- a/plugins/git4idea/shared/src/com/intellij/vcs/git/shared/GitDataHoldersInitializer.kt
+++ b/plugins/git4idea/shared/src/com/intellij/vcs/git/shared/GitDataHoldersInitializer.kt
@@ -12,7 +12,7 @@ import kotlinx.coroutines.launch
 
 internal class GitDataHoldersInitializer : ProjectActivity {
   override suspend fun execute(project: Project) {
-    if (application.isUnitTestMode) return
+    if (application.isUnitTestMode || isCodeWithMe()) return
 
     coroutineScope {
       launch {
diff --git a/plugins/git4idea/shared/src/com/intellij/vcs/git/shared/rdWidgetRegistry.kt b/plugins/git4idea/shared/src/com/intellij/vcs/git/shared/rdWidgetRegistry.kt
index 0e9cde5f8fb2..c19d27a258e2 100644
--- a/plugins/git4idea/shared/src/com/intellij/vcs/git/shared/rdWidgetRegistry.kt
+++ b/plugins/git4idea/shared/src/com/intellij/vcs/git/shared/rdWidgetRegistry.kt
@@ -1,8 +1,15 @@
 package com.intellij.vcs.git.shared
 
+import com.intellij.frontend.FrontendApplicationInfo
+import com.intellij.frontend.FrontendType
 import com.intellij.openapi.util.registry.Registry
 import org.jetbrains.annotations.ApiStatus
 
 @ApiStatus.Internal
 fun Registry.Companion.isRdBranchWidgetEnabled(): Boolean =
-  `is`("git.branches.widget.rd", true)
\ No newline at end of file
+  `is`("git.branches.widget.rd", true) && !isCodeWithMe()
+
+internal fun isCodeWithMe(): Boolean {
+  val frontendType = FrontendApplicationInfo.getFrontendType() as? FrontendType.RemoteDev ?: return false
+  return !frontendType.isLuxSupported
+}
\ No newline at end of file