diff --git a/platform/platform-impl/src/com/intellij/ui/messages/SheetController.java b/platform/platform-impl/src/com/intellij/ui/messages/SheetController.java
index 5582e37fbd88..d9d65955a9be 100755
--- a/platform/platform-impl/src/com/intellij/ui/messages/SheetController.java
+++ b/platform/platform-impl/src/com/intellij/ui/messages/SheetController.java
@@ -16,6 +16,7 @@
 package com.intellij.ui.messages;
 
 import com.intellij.icons.AllIcons;
+import com.intellij.openapi.Disposable;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.Messages;
@@ -45,7 +46,7 @@ import static com.intellij.openapi.wm.IdeFocusManager.getGlobalInstance;
 /**
  * Created by Denis Fokin
  */
-public class SheetController {
+public class SheetController implements Disposable {
 
   private static final KeyStroke VK_ESC_KEYSTROKE = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0);
 
diff --git a/platform/platform-impl/src/com/intellij/ui/messages/SheetMessage.java b/platform/platform-impl/src/com/intellij/ui/messages/SheetMessage.java
index 8f1b4d9c98e3..e0edee2b7a78 100755
--- a/platform/platform-impl/src/com/intellij/ui/messages/SheetMessage.java
+++ b/platform/platform-impl/src/com/intellij/ui/messages/SheetMessage.java
@@ -16,9 +16,11 @@
 package com.intellij.ui.messages;
 
 import com.apple.eawt.FullScreenUtilities;
+import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.impl.LaterInvocator;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.ui.DialogWrapper;
+import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.ui.Gray;
 import com.intellij.ui.JBColor;
@@ -42,7 +44,7 @@ import static com.intellij.openapi.wm.IdeFocusManager.getGlobalInstance;
 /**
  * Created by Denis Fokin
  */
-public class SheetMessage {
+public class SheetMessage implements Disposable {
   private static final Logger LOG = Logger.getInstance("#com.intellij.ui.messages.SheetMessage");
 
   private final JDialog myWindow;
@@ -53,18 +55,6 @@ public class SheetMessage {
 
   private Image staticImage;
   private int imageHeight;
-  private final boolean restoreFullScreenButton;
-  private final ComponentAdapter myPositionListener = new ComponentAdapter() {
-    @Override
-    public void componentResized(ComponentEvent event) {
-      setPositionRelativeToParent();
-    }
-
-    @Override
-    public void componentMoved(ComponentEvent event) {
-      setPositionRelativeToParent();
-    }
-  };
 
   public SheetMessage(final Window owner,
                       final String title,
@@ -84,21 +74,36 @@ public class SheetMessage {
     myWindow = new JDialog(owner, "This should not be shown", Dialog.ModalityType.APPLICATION_MODAL);
     myWindow.getRootPane().putClientProperty("apple.awt.draggableWindowBackground", Boolean.FALSE);
 
-    myWindow.addWindowListener(new WindowAdapter() {
+    WindowAdapter windowListener = new WindowAdapter() {
       @Override
       public void windowActivated(@NotNull WindowEvent e) {
         super.windowActivated(e);
       }
-    });
+    };
+    myWindow.addWindowListener(windowListener);
+    Disposer.register(this, () -> myWindow.removeWindowListener(windowListener));
 
     myParent = owner;
 
     myWindow.setUndecorated(true);
     myWindow.setBackground(Gray.TRANSPARENT);
     myController = new SheetController(this, title, message, icon, buttons, defaultButton, doNotAskOption, focusedButton);
+    Disposer.register(this, myController);
 
     imageHeight = 0;
-    myParent.addComponentListener(myPositionListener);
+    ComponentAdapter componentAdapter = new ComponentAdapter() {
+      @Override
+      public void componentResized(ComponentEvent event) {
+        setPositionRelativeToParent();
+      }
+
+      @Override
+      public void componentMoved(ComponentEvent event) {
+        setPositionRelativeToParent();
+      }
+    };
+    myParent.addComponentListener(componentAdapter);
+    Disposer.register(this, () -> myParent.removeComponentListener(componentAdapter));
     myWindow.setFocusable(true);
     myWindow.setFocusableWindowState(true);
     if (SystemInfo.isJavaVersionAtLeast("1.7")) {
@@ -106,23 +111,25 @@ public class SheetMessage {
 
       setWindowOpacity(0.0f);
 
-      myWindow.addComponentListener(new ComponentAdapter() {
+      ComponentAdapter componentListener = new ComponentAdapter() {
         @Override
         public void componentShown(@NotNull ComponentEvent e) {
           super.componentShown(e);
           setWindowOpacity(1.0f);
           myWindow.setSize(myController.SHEET_NC_WIDTH, myController.SHEET_NC_HEIGHT);
         }
-      });
+      };
+      myWindow.addComponentListener(componentListener);
+      Disposer.register(this, () -> myWindow.removeComponentListener(componentListener));
     } else {
       myWindow.setModal(true);
       myWindow.setSize(myController.SHEET_NC_WIDTH, myController.SHEET_NC_HEIGHT);
       setPositionRelativeToParent();
     }
     startAnimation(true);
-    restoreFullScreenButton = couldBeInFullScreen();
-    if (restoreFullScreenButton) {
+    if (couldBeInFullScreen()) {
       FullScreenUtilities.setWindowCanFullScreen(myParent, false);
+      Disposer.register(this, () -> FullScreenUtilities.setWindowCanFullScreen(myParent, true));
     }
 
     LaterInvocator.enterModal(myWindow);
@@ -140,12 +147,16 @@ public class SheetMessage {
     // focusCandidate is null if a welcome screen is closed and ide frame is not opened.
     // this is ok. We set focus correctly on our frame activation.
     if (focusCandidate != null) {
-      getGlobalInstance().doWhenFocusSettlesDown(() -> {
-        getGlobalInstance().requestFocus(finalFocusCandidate, true);
-      });
+      getGlobalInstance().doWhenFocusSettlesDown(() -> getGlobalInstance().requestFocus(finalFocusCandidate, true));
     }
   }
 
+  @Override
+  public void dispose() {
+    DialogWrapper.cleanupRootPane(myWindow.getRootPane());
+    myWindow.dispose();
+  }
+
   private static void maximizeIfNeeded(final Window owner) {
     if (owner == null) return;
     if (owner instanceof Frame) {
@@ -235,20 +246,12 @@ public class SheetMessage {
           myController.requestFocus();
         } 
         else {
-          if (restoreFullScreenButton) {
-            FullScreenUtilities.setWindowCanFullScreen(myParent, true);
-          }
-          myParent.removeComponentListener(myPositionListener);
-          myController.dispose();
-          DialogWrapper.cleanupWindowListeners(myWindow);
-          myWindow.dispose();
-          DialogWrapper.cleanupRootPane(myWindow.getRootPane());
+          Disposer.dispose(this);
         }
       }
     };
-
+    Disposer.register(this, myAnimator);
     myAnimator.resume();
-
   }
 
   private void setPositionRelativeToParent () {