From 3f1c352c87980217a0c58a443ae0d8047ddaf1e2 Mon Sep 17 00:00:00 2001
From: Sergey Malenkov <sergey.malenkov@jetbrains.com>
Date: Wed, 22 Mar 2017 18:29:36 +0300
Subject: [PATCH] IDEA-169661 Git branches popup appears with its right part
 out of visible screen area

---
 .../platform-impl/src/com/intellij/ui/popup/WizardPopup.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java b/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java
index eb9c4ed61d68..0f56f6b09d31 100644
--- a/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java
+++ b/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java
@@ -309,6 +309,9 @@ public abstract class WizardPopup extends AbstractPopup implements ActionListene
 
     @Override
     public Dimension getPreferredSize() {
+      if (isPreferredSizeSet()) {
+        return super.getPreferredSize();
+      }
       final Component focusOwner = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
       Point p = null;
       if (focusOwner != null && focusOwner.isShowing()) {