diff --git a/pcbnew/plot_brditems_plotter.cpp b/pcbnew/plot_brditems_plotter.cpp
index ded3e4f918..5ad142f862 100644
--- a/pcbnew/plot_brditems_plotter.cpp
+++ b/pcbnew/plot_brditems_plotter.cpp
@@ -1164,6 +1164,9 @@ void BRDITEMS_PLOTTER::PlotTableBorders( const PCB_TABLE* aTable )
                     PCB_TABLECELL* cell = aTable->GetCell( row, col );
                     VECTOR2I       topRight( cell->GetEndX(), cell->GetStartY() );
 
+                    if( !cell->GetTextAngle().IsHorizontal() )
+                        topRight = VECTOR2I( cell->GetStartX(), cell->GetEndY() );
+
                     if( cell->GetColSpan() > 0 && cell->GetRowSpan() > 0 )
                         strokeLine( topRight, cell->GetEnd() );
                 }
@@ -1179,6 +1182,9 @@ void BRDITEMS_PLOTTER::PlotTableBorders( const PCB_TABLE* aTable )
                     PCB_TABLECELL* cell = aTable->GetCell( row, col );
                     VECTOR2I       botLeft( cell->GetStartX(), cell->GetEndY() );
 
+                    if( !cell->GetTextAngle().IsHorizontal() )
+                        botLeft = VECTOR2I( cell->GetEndX(), cell->GetStartY() );
+
                     if( cell->GetColSpan() > 0 && cell->GetRowSpan() > 0 )
                         strokeLine( botLeft, cell->GetEnd() );
                 }