diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBorders.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBorders.java
index 95cff96dad6..b399251059f 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBorders.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBorders.java
@@ -1118,7 +1118,7 @@ public class MetalBorders {
         }
 
         public Insets getBorderInsets(Component c, Insets insets) {
-            insets.set(2, 2, 2, 0);
+            insets.set(2, 2, 2, 2);
             return insets;
         }
     }
diff --git a/test/jdk/javax/swing/JTableHeader/JTableHeaderLabelRightAlignTest.java b/test/jdk/javax/swing/JTableHeader/JTableHeaderLabelRightAlignTest.java
new file mode 100644
index 00000000000..49a9f7afa3c
--- /dev/null
+++ b/test/jdk/javax/swing/JTableHeader/JTableHeaderLabelRightAlignTest.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.imageio.ImageIO;
+import javax.swing.JLabel;
+import javax.swing.JTable;
+import javax.swing.SwingUtilities;
+import javax.swing.table.JTableHeader;
+import javax.swing.UIManager;
+
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+
+import java.io.File;
+import java.io.IOException;
+
+/*
+ * @test
+ * @bug 8301606
+ * @summary Test to check if the Right aligned header
+ *          label doesn't cut off Metal Look&Feel
+ * @run main JTableHeaderLabelRightAlignTest
+ */
+public class JTableHeaderLabelRightAlignTest {
+    private static final double SCALE = 2.25;
+
+    public static void main(String[] args) throws Exception {
+        UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
+        String[][] data = {
+                {"1", "1"}
+        };
+
+        String[] columnNames = {"Size", "Size"};
+
+        JTable table = new JTable(data, columnNames);
+
+        ((JLabel)table.getTableHeader().getDefaultRenderer())
+                .setHorizontalAlignment(JLabel.RIGHT);
+
+        final JTableHeader header = table.getTableHeader();
+        Dimension size = header.getPreferredSize();
+        header.setSize(size);
+
+        BufferedImage imgHeader =
+                new BufferedImage((int)Math.ceil(SCALE * size.width),
+                        (int)Math.ceil(SCALE * size.height),
+                        BufferedImage.TYPE_INT_RGB);
+        Graphics2D g2d = imgHeader.createGraphics();
+        g2d.scale(SCALE, SCALE);
+        try {
+            header.paint(g2d);
+        } finally {
+            g2d.dispose();
+        }
+
+        int x = (int)(table.getTableHeader()
+                           .getColumnModel()
+                           .getColumn(0)
+                           .getWidth() * SCALE);
+        int expectedRGB = imgHeader.getRGB(x, 1);
+
+        for (int y = 1; y < (imgHeader.getHeight() - 3); y++) {
+            if (expectedRGB != imgHeader.getRGB(x, y)) {
+                saveImage(imgHeader, "failureImage.png");
+                throw new RuntimeException("Test Failed at <" + x + ", " + y + ">");
+            }
+        }
+        System.out.println("Test Passed");
+    }
+
+    private static void saveImage(BufferedImage image, String fileName) {
+        try {
+            ImageIO.write(image, "png", new File(fileName));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}