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 62f8ae24547e..e37ad8f968ad 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
@@ -83,6 +83,7 @@ import com.intellij.util.ui.ButtonlessScrollBarUI;
 import com.intellij.util.ui.GraphicsUtil;
 import com.intellij.util.ui.MacUIUtil;
 import com.intellij.util.ui.UIUtil;
+import com.intellij.util.ui.update.Activatable;
 import com.intellij.util.ui.update.UiNotifyConnector;
 import gnu.trove.TIntArrayList;
 import gnu.trove.TIntFunction;
@@ -879,9 +880,6 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
           repaintLines(caretLine, caretLine);
         }
         fireFocusGained();
-        if (myGutterNeedsUpdate) {
-          updateGutterSize();
-        }
       }
 
       @Override
@@ -895,6 +893,15 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
       }
     });
 
+    new UiNotifyConnector(myEditorComponent, new Activatable.Adapter(){
+      @Override
+      public void showNotify() {
+        if (myGutterNeedsUpdate) {
+          updateGutterSize();
+        }
+      }
+    });
+
     try {
       final DropTarget dropTarget = myEditorComponent.getDropTarget();
       if (dropTarget != null) { // might be null in headless environment