diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
index 2a31069dacca..c63b84387e7a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
@@ -2274,7 +2274,8 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
   }
 
   private void processMouseDragged(@NotNull MouseEvent e) {
-    if (!JBSwingUtilities.isLeftMouseButton(e) && !JBSwingUtilities.isMiddleMouseButton(e)) {
+    if (!JBSwingUtilities.isLeftMouseButton(e) && !JBSwingUtilities.isMiddleMouseButton(e)
+        || (Registry.is("editor.disable.drag.with.right.button") && JBSwingUtilities.isRightMouseButton(e))) {
       return;
     }
 
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index 9577d9aba3c3..505e4895fa45 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -1401,5 +1401,8 @@ editor.show.right.margin.in.read.only.files.description=Show right margin for re
 
 editor.text.fractional.metrics=false
 editor.text.fractional.metrics.description=Do not round glyph advances to integer values
+editor.disable.drag.with.right.button=false
+editor.disable.drag.with.right.button.description=Disable any mouse drag processing in editor with right mouse button pressed
+
 idea.invalidate.caches.invalidates.vfs=false
 idea.invalidate.caches.invalidates.vfs.description=Invalidate caches tries to invalidate everything, including Local History
\ No newline at end of file