diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ui/MergePanel2.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ui/MergePanel2.java
index 2ebac7c61ddb..a26ad70fd08c 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ui/MergePanel2.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ui/MergePanel2.java
@@ -411,7 +411,7 @@ public class MergePanel2 implements DiffViewer {
       editor.getSettings().setFoldingOutlineShown(false);
       editor.getFoldingModel().setFoldingEnabled(false);
       editor.getSettings().setLineMarkerAreaShown(false);
-
+      editor.getGutterComponentEx().setShowDefaultGutterPopup(false);
       initEditorSettings(editor);
 
       return editor;
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorGutterComponentEx.java b/platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorGutterComponentEx.java
index 1d936db0345e..43090c6dfe42 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorGutterComponentEx.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorGutterComponentEx.java
@@ -56,4 +56,6 @@ public abstract class EditorGutterComponentEx extends JComponent implements Edit
   public abstract Point getPoint(GutterIconRenderer renderer);
 
   public abstract void setLineNumberConvertor(final Convertor<Integer, Integer> lineNumberConvertor);
+
+  public abstract void setShowDefaultGutterPopup(boolean show);
 }
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
index b5403375405b..08d0a0f0d559 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
@@ -91,6 +91,7 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
   private String myLastGutterToolTip = null;
   private int myLastPreferredHeight = -1;
   private Convertor<Integer, Integer> myLineNumberConvertor;
+  private boolean myShowDefaultGutterPopup = true;
 
   @SuppressWarnings("unchecked")
   public EditorGutterComponentImpl(EditorImpl editor) {
@@ -1343,6 +1344,11 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
     myLineNumberConvertor = lineNumberConvertor;
   }
 
+  @Override
+  public void setShowDefaultGutterPopup(boolean show) {
+    myShowDefaultGutterPopup = show;
+  }
+
   private void invokePopup(MouseEvent e) {
     final ActionManager actionManager = ActionManager.getInstance();
     if (myEditor.getMouseEventArea(e) == EditorMouseEventArea.ANNOTATIONS_AREA) {
@@ -1381,9 +1387,11 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
         }
       }
       else {
-        ActionGroup group = (ActionGroup)CustomActionsSchema.getInstance().getCorrectedAction(IdeActions.GROUP_EDITOR_GUTTER);
-        ActionPopupMenu popupMenu = actionManager.createActionPopupMenu(ActionPlaces.UNKNOWN, group);
-        popupMenu.getComponent().show(this, e.getX(), e.getY());
+        if (myShowDefaultGutterPopup) {
+          ActionGroup group = (ActionGroup)CustomActionsSchema.getInstance().getCorrectedAction(IdeActions.GROUP_EDITOR_GUTTER);
+          ActionPopupMenu popupMenu = actionManager.createActionPopupMenu(ActionPlaces.UNKNOWN, group);
+          popupMenu.getComponent().show(this, e.getX(), e.getY());
+        }
         e.consume();
       }
     }