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 7c183a3b240b..d98d014a0165 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
@@ -177,7 +177,12 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
         @Override
         public DnDDragStartBean fun(DnDActionInfo info) {
           final GutterMark renderer = getGutterRenderer(info.getPoint());
-          return renderer != null && (info.isCopy() || info.isMove()) ? new DnDDragStartBean(renderer) : null;
+          if (renderer instanceof GutterIconRenderer &&
+              ((GutterIconRenderer)renderer).getDraggableObject() != null &&
+              (info.isCopy() || info.isMove())) {
+            return new DnDDragStartBean(renderer);
+          }
+          return null;
         }
       })
       .setDropHandler(new DnDDropHandler() {