diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/TabsBorder.java b/platform/platform-api/src/com/intellij/ui/tabs/impl/TabsBorder.java
index 24ab9afb0239..284b5af47d20 100644
--- a/platform/platform-api/src/com/intellij/ui/tabs/impl/TabsBorder.java
+++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/TabsBorder.java
@@ -45,7 +45,7 @@ public class TabsBorder {
 
     myEffectiveBorder = null;
 
-    myTabs.revalidateAndRepaint(false);
+    myTabs.relayout(true, false);
 
     return myTabs;
   }
@@ -77,7 +77,6 @@ public class TabsBorder {
       myPosition == JBTabsPosition.bottom ? myTabBorderSize : myBorderSize.bottom,
       myPosition == JBTabsPosition.right ? myTabBorderSize : myBorderSize.right
     );
-
     return (Insets)myEffectiveBorder.clone();
   }
 }
diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/singleRow/SingleRowLayout.java b/platform/platform-api/src/com/intellij/ui/tabs/impl/singleRow/SingleRowLayout.java
index d2f8096a0b84..876b06f794e2 100644
--- a/platform/platform-api/src/com/intellij/ui/tabs/impl/singleRow/SingleRowLayout.java
+++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/singleRow/SingleRowLayout.java
@@ -17,6 +17,7 @@ package com.intellij.ui.tabs.impl.singleRow;
 
 import com.intellij.ui.tabs.TabInfo;
 import com.intellij.ui.tabs.impl.*;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/table/TableLayout.java b/platform/platform-api/src/com/intellij/ui/tabs/impl/table/TableLayout.java
index b710c582b7dc..2efd1ec0d6b3 100644
--- a/platform/platform-api/src/com/intellij/ui/tabs/impl/table/TableLayout.java
+++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/table/TableLayout.java
@@ -128,6 +128,8 @@ public class TableLayout extends TabLayout {
         toAjust = true;
       }
 
+      toAjust |= myTabs.myForcedRelayout;
+
       for (int i = 0; i < eachRow.myColumns.size(); i++) {
         TabInfo tabInfo = eachRow.myColumns.get(i);
         final TabLabel label = myTabs.myInfo2Label.get(tabInfo);
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/InternalDecorator.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/InternalDecorator.java
index 2c59cb33fc98..f86abc0c1b11 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/InternalDecorator.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/InternalDecorator.java
@@ -463,7 +463,7 @@ public final class InternalDecorator extends JPanel implements Queryable, TypeSa
       }
 
       if (insets.bottom > 0) {
-        UIUtil.drawLine(g, x + 1, y + height - 1, x + width - 1, y + height - 1);
+        UIUtil.drawLine(g, x, y + height - 1, x + width - 1, y + height - 1);
        }
     }