diff --git a/platform/platform-api/src/com/intellij/ui/AutoScrollFromSourceHandler.java b/platform/platform-api/src/com/intellij/ui/AutoScrollFromSourceHandler.java
index f36bab6f0c7d..42f3ec997db8 100644
--- a/platform/platform-api/src/com/intellij/ui/AutoScrollFromSourceHandler.java
+++ b/platform/platform-api/src/com/intellij/ui/AutoScrollFromSourceHandler.java
@@ -2,6 +2,7 @@
 
 package com.intellij.ui;
 
+import com.intellij.codeWithMe.ClientId;
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.AnActionEvent;
@@ -71,6 +72,9 @@ public abstract class AutoScrollFromSourceHandler {
   }
 
   private void selectInAlarm(final FileEditor editor) {
+    // Code WithMe: do not process changes from remote (client) editor switching
+    if (!ClientId.isCurrentlyUnderLocalId()) return;
+
     if (editor != null && myComponent.isShowing() && isAutoScrollEnabled()) {
       myAlarm.cancelAllRequests();
       myAlarm.addRequest(() -> selectElementFromEditor(editor), getAlarmDelay(), getModalityState());